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 00702aa2c2fac3cbeeb20ccfcdaba06b6abb9228..966b9e1c13ea01f17ef6b941a67a562b5c5fe589 100644 (file)
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -80,7 +80,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 bcddc7e46e106d2fa70ddfc99f1784194a2fb324..e771d25a166a52221a4056c931533a76da70df8c 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -78,6 +78,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 550a7559a084746396e0c5c3f331daa510cc488b..ee609ddbc9f88c64bdb76aca2472f5ce9247d520 100644 (file)
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -61,7 +61,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
@@ -80,7 +81,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 c3e54c8ce2ea776f60a5ebda810c8a4725cd9cbb..ac160a3c48c0529dd91258bdbb4b03ee39e08de6 100644 (file)
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_spec.rb
@@ -67,7 +67,8 @@ describe 'ceilometer::collector' do
           :name       => platform_params[:collector_service_name],
           :enable     => true,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
 
@@ -86,7 +87,8 @@ describe 'ceilometer::collector' do
           :name       => platform_params[:collector_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
     end
@@ -103,7 +105,8 @@ describe 'ceilometer::collector' do
           :name       => platform_params[:collector_service_name],
           :enable     => false,
           :hasstatus  => true,
-          :hasrestart => true
+          :hasrestart => true,
+          :tag        => 'ceilometer-service'
         )
       end
     end