Add 'ceilometer-service' tag to collector and agent/notification

Set the 'ceilometer-service' tag for the collector and the
notification services as it happens already for the others.

Change-Id: I4c6fe871a1d55ea4dfdfc33edafdcf57bbd91e5e
(cherry picked from commit 497aad5423733aabff6d588b1817ffe42dfc175e)

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index ac8ccb785e0ea4802c81050a3ef5d591aa8b878b..d4c70e869f1e6afc321483154ff2fd7a7368527c 100644 (file)
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -90,7 +90,8 @@ class ceilometer::agent::notification (
     name       => $::ceilometer::params::agent_notification_service_name,
     enable     => $enabled,
     hasstatus  => true,
-    hasrestart => true
+    hasrestart => true,
+    tag        => 'ceilometer-service'
   }
 
   ceilometer_config {

diff --git a/manifests/collector.pp b/manifests/collector.pp
index 717dd21cff63d893215d05d97d234424e44ee456..10d3d8a90f45d60649a9b00949ac565b827835ed 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -87,6 +87,7 @@ class ceilometer::collector (
     name       => $::ceilometer::params::collector_service_name,
     enable     => $enabled,
     hasstatus  => true,
-    hasrestart => true
+    hasrestart => true,
+    tag        => 'ceilometer-service'
   }
 }

diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index 1a552a0ee5f3857855aec339c565bd179d308e59..40a031aef0e3354f399a43f54ac4dcddb282386f 100644 (file)
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -72,7 +72,8 @@ describe 'ceilometer::agent::notification' do
             :name       => platform_params[:agent_notification_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
-            :hasrestart => true
+            :hasrestart => true,
+            :tag        => 'ceilometer-service'
           )
         end
       end
@@ -91,7 +92,8 @@ describe 'ceilometer::agent::notification' do
           :name       => platform_params[:agent_notification_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
     end

diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index 38f39353712f709c8ac05d06710f2fa4329aa4d2..6c74e2ba0197bed783676cb9a26e6c4fa3947b8d 100644 (file)
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_spec.rb
@@ -68,7 +68,8 @@ describe 'ceilometer::collector' do
           :name       => platform_params[:collector_service_name],
           :enable     => true,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
 
@@ -87,7 +88,8 @@ describe 'ceilometer::collector' do
           :name       => platform_params[:collector_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
     end
@@ -104,7 +106,8 @@ describe 'ceilometer::collector' do
           :name       => platform_params[:collector_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
     end