From: Ivan Chavero <ichavero@redhat.com>
Date: Mon, 26 May 2014 12:54:45 +0000 (-0600)
Subject: Fixes agent_notification_service_name
X-Git-Tag: 4.1.0~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c4498ec7f5e23975fe4b4dc40fcc4d4a390007c1;p=puppet-modules%2Fpuppet-ceilometer.git

Fixes agent_notification_service_name

This patch corrects the service name of the ceilometer notification
agent, which was 'ceilometer-agent-notification' in pre-release RPMs but
was later changed to 'ceilometer-notification'.

Change-Id: Ie2703a028ce154efa7fa1d0da58914230adfc7db
(cherry picked from commit 00bfaa1fa4709cec6a03e2772445dc8f27a89224)
---

diff --git a/manifests/params.pp b/manifests/params.pp
index feb1e19..1c370ae 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -23,11 +23,12 @@ class ceilometer::params {
       $agent_compute_service_name      = 'openstack-ceilometer-compute'
       $api_service_name                = 'openstack-ceilometer-api'
       $collector_service_name          = 'openstack-ceilometer-collector'
-      $agent_notification_service_name = 'openstack-ceilometer-agent-notification'
       $alarm_notifier_service_name     = 'openstack-ceilometer-alarm-notifier'
       $alarm_evaluator_service_name    = 'openstack-ceilometer-alarm-evaluator'
       $pymongo_package_name            = 'python-pymongo'
       $psycopg_package_name            = 'python-psycopg2'
+      $agent_notification_service_name = 'openstack-ceilometer-notification'
+
       # db packages
       if $::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18 {
         # fallback to stdlib version, not provided on fedora
diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index 383080c..a7ad76e 100644
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -76,7 +76,55 @@ describe 'ceilometer::agent::notification' do
 
     let :platform_params do
       { :agent_notification_package_name => 'openstack-ceilometer-collector',
-        :agent_notification_service_name => 'openstack-ceilometer-agent-notification' }
+        :agent_notification_service_name => 'openstack-ceilometer-notification' }
+    end
+
+    it_configures 'ceilometer-agent-notification'
+  end
+
+  context 'on RHEL 7' do
+    let :facts do
+      { :osfamily => 'RedHat',
+        :operatingsystem => 'RedHat',
+        :operatingsystemrelease => 7
+      }
+    end
+
+    let :platform_params do
+      { :agent_notification_package_name => 'openstack-ceilometer-collector',
+        :agent_notification_service_name => 'openstack-ceilometer-notification' }
+    end
+
+    it_configures 'ceilometer-agent-notification'
+  end
+
+  context 'on CentOS 7' do
+    let :facts do
+      { :osfamily => 'RedHat',
+        :operatingsystem => 'CentOS',
+        :operatingsystemrelease => 7
+      }
+    end
+
+    let :platform_params do
+      { :agent_notification_package_name => 'openstack-ceilometer-collector',
+        :agent_notification_service_name => 'openstack-ceilometer-notification' }
+    end
+
+    it_configures 'ceilometer-agent-notification'
+  end
+
+  context 'on Fedora 20' do
+    let :facts do
+      { :osfamily => 'RedHat',
+        :operatingsystem => 'Fedora',
+        :operatingsystemrelease => 20
+      }
+    end
+
+    let :platform_params do
+      { :agent_notification_package_name => 'openstack-ceilometer-collector',
+        :agent_notification_service_name => 'openstack-ceilometer-notification' }
     end
 
     it_configures 'ceilometer-agent-notification'