Tag all Ceilometer packages

Some users wish to override the default package provider by their own.

Tag all packages with the 'openstack' to allow mass resource attributes
override using resource collectors.

Closes-bug: #1391209

Change-Id: If43101b9974d26c88f8612da64c5356a644f892e
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>

diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
index e197b383bdde43fcffa314f9e4dc8fbe27a3b45f..5fa5b097d7eb0c31cdbdbc004cf8246ecc5bbaab 100644 (file)
--- a/manifests/agent/central.pp
+++ b/manifests/agent/central.pp
@@ -33,6 +33,7 @@ class ceilometer::agent::central (
   package { 'ceilometer-agent-central':
     ensure => $package_ensure,
     name   => $::ceilometer::params::agent_central_package_name,
+    tag    => 'openstack',
   }
 
   if $manage_service {

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index 2cd02ac9d89ef1679d4ba6896fca1e8d2b312fec..1c48c781ce7f5d19bc6e509edd898b075800348c 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -30,6 +30,7 @@ class ceilometer::agent::compute (
   package { 'ceilometer-agent-compute':
     ensure => $package_ensure,
     name   => $::ceilometer::params::agent_compute_package_name,
+    tag    => 'openstack',
   }
 
   if $::ceilometer::params::libvirt_group {

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index de0c9546a42a65a666728c4d71e7c76e8fd37618..00702aa2c2fac3cbeeb20ccfcdaba06b6abb9228 100644 (file)
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -60,7 +60,10 @@ class ceilometer::agent::notification (
   Service['ceilometer-agent-notification']
 
   ensure_resource('package', [$::ceilometer::params::agent_notification_package_name],
-    { ensure => $package_ensure }
+    {
+      ensure => $package_ensure,
+      tag    => 'openstack'
+    }
   )
 
   if $manage_service {

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 209b4eab13b5648fbd454d00b3b2468cba9bdc38..a4316af21766cbbaaa239680de0c952ffdec3de3 100644 (file)
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -104,6 +104,7 @@ class ceilometer::agent::polling (
   package { 'ceilometer-polling':
     ensure => $package_ensure,
     name   => $::ceilometer::params::agent_polling_package_name,
+    tag    => 'openstack',
   }
 
   if $namespaces_real {

diff --git a/manifests/alarm/evaluator.pp b/manifests/alarm/evaluator.pp
index 55c922abe4698204a64585a292b739e0018616c0..29ad75d256040da2ec78051d9c24b68d062aa864 100644 (file)
--- a/manifests/alarm/evaluator.pp
+++ b/manifests/alarm/evaluator.pp
@@ -47,7 +47,9 @@ class ceilometer::alarm::evaluator (
 
   Package[$::ceilometer::params::alarm_package_name] -> Service['ceilometer-alarm-evaluator']
   Package[$::ceilometer::params::alarm_package_name] -> Package<| title == 'ceilometer-alarm' |>
-  ensure_packages($::ceilometer::params::alarm_package_name)
+  ensure_packages($::ceilometer::params::alarm_package_name,
+    { tag => 'openstack' }
+  )
 
   if $manage_service {
     if $enabled {

diff --git a/manifests/alarm/notifier.pp b/manifests/alarm/notifier.pp
index d4be85ce1038edd86458962c6b31cf3d5f7b1827..a07d4d5b320776cb6fe83086b4eeb23c87a47b7f 100644 (file)
--- a/manifests/alarm/notifier.pp
+++ b/manifests/alarm/notifier.pp
@@ -42,7 +42,9 @@ class ceilometer::alarm::notifier (
 
   Package[$::ceilometer::params::alarm_package_name] -> Service['ceilometer-alarm-notifier']
   Package[$::ceilometer::params::alarm_package_name] -> Package<| title == 'ceilometer-alarm' |>
-  ensure_packages($::ceilometer::params::alarm_package_name)
+  ensure_packages($::ceilometer::params::alarm_package_name,
+    { tag => 'openstack' }
+  )
 
   if $manage_service {
     if $enabled {

diff --git a/manifests/api.pp b/manifests/api.pp
index fd58ddeb52fb20a8c1757d24ec316f93d1282948..f2c1e31164648ead5b0c147bf02bcad5d530b4b7 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -96,6 +96,7 @@ class ceilometer::api (
   package { 'ceilometer-api':
     ensure => $package_ensure,
     name   => $::ceilometer::params::api_package_name,
+    tag    => 'openstack',
   }
 
   if $manage_service {

diff --git a/manifests/client.pp b/manifests/client.pp
index c02ac3c0f6314912bb16648b5ebddf3256c89c10..5c54639c5f0145a97782dfa8c4db9036d5fe9c9f 100644 (file)
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -14,6 +14,7 @@ class ceilometer::client (
   package { 'python-ceilometerclient':
     ensure => $ensure,
     name   => $::ceilometer::params::client_package_name,
+    tag    => 'openstack',
   }
 
 }

diff --git a/manifests/db.pp b/manifests/db.pp
index 74af7994a380f3eca0005e9d747ac59a7386fa8f..760d8e5c321b621f937813da6fbe4ef30622894d 100644 (file)
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -59,6 +59,7 @@ class ceilometer::db (
     package {'ceilometer-backend-package':
       ensure => present,
       name   => $backend_package,
+      tag    => 'openstack',
     }
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index cdfaef7ba46b2cbe9b1f201b6df60393354dae0c..124eaa10ef579e341a9cdc500f6f3c778e3bd60e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -159,6 +159,7 @@ class ceilometer(
   package { 'ceilometer-common':
     ensure => $package_ensure,
     name   => $::ceilometer::params::common_package_name,
+    tag    => 'openstack',
   }
 
   Package['ceilometer-common'] -> Ceilometer_config<||>

diff --git a/spec/classes/ceilometer_agent_central_spec.rb b/spec/classes/ceilometer_agent_central_spec.rb
index 5643e1d703b5583955b57aa0e792274d7808805b..c5587626ed648dd0fd24b43a5059d3721c96c5c5 100644 (file)
--- a/spec/classes/ceilometer_agent_central_spec.rb
+++ b/spec/classes/ceilometer_agent_central_spec.rb
@@ -22,7 +22,8 @@ describe 'ceilometer::agent::central' do
       is_expected.to contain_package('ceilometer-agent-central').with(
         :ensure => 'latest',
         :name   => platform_params[:agent_package_name],
-        :before => 'Service[ceilometer-agent-central]'
+        :before => 'Service[ceilometer-agent-central]',
+        :tag    => 'openstack'
       )
     end
 

diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
index bea0b2505e67575567108578b2a8c4696d228750..28325b5af21e37a98e6dc783878162a94111ad07 100644 (file)
--- a/spec/classes/ceilometer_agent_compute_spec.rb
+++ b/spec/classes/ceilometer_agent_compute_spec.rb
@@ -22,7 +22,8 @@ describe 'ceilometer::agent::compute' do
       is_expected.to contain_package('ceilometer-agent-compute').with(
         :ensure => 'installed',
         :name   => platform_params[:agent_package_name],
-        :before => 'Service[ceilometer-agent-compute]'
+        :before => 'Service[ceilometer-agent-compute]',
+        :tag    => 'openstack'
       )
     end
 

diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index e1cd8ec67a0e2ad6d9986a42d9b280cdf3b998f9..550a7559a084746396e0c5c3f331daa510cc488b 100644 (file)
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -39,7 +39,8 @@ describe 'ceilometer::agent::notification' do
 
     it 'installs ceilometer agent notification package' do
       is_expected.to contain_package(platform_params[:agent_notification_package_name]).with(
-        :ensure => 'present'
+        :ensure => 'present',
+        :tag    => 'openstack'
       )
     end
 

diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index 34a010573731ec5a562c25e7b718e25429e4a341..289214689a6598cb60973c6ba1fb854b901347df 100644 (file)
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -56,7 +56,8 @@ describe 'ceilometer::agent::polling' do
       should contain_package('ceilometer-polling').with(
         :ensure => 'latest',
         :name   => platform_params[:agent_package_name],
-        :before => /Service\[ceilometer-polling\]/
+        :before => /Service\[ceilometer-polling\]/,
+        :tag    => 'openstack'
       )
     end
 

diff --git a/spec/classes/ceilometer_alarm_evaluator_spec.rb b/spec/classes/ceilometer_alarm_evaluator_spec.rb
index b1fe5bcb02f7df2e2c8a16fed7096b37cf0002ae..503956a12ec32c561fdf21a521c2b52543fff851 100644 (file)
--- a/spec/classes/ceilometer_alarm_evaluator_spec.rb
+++ b/spec/classes/ceilometer_alarm_evaluator_spec.rb
@@ -23,7 +23,8 @@ describe 'ceilometer::alarm::evaluator' do
       is_expected.to contain_package(platform_params[:alarm_evaluator_package_name]).with_before('Service[ceilometer-alarm-evaluator]')
       is_expected.to contain_package(platform_params[:alarm_evaluator_package_name]).with(
         :ensure => 'present',
-        :name   => platform_params[:alarm_evaluator_package_name]
+        :name   => platform_params[:alarm_evaluator_package_name],
+        :tag    => 'openstack'
       )
     end
 

diff --git a/spec/classes/ceilometer_alarm_notifier_spec.rb b/spec/classes/ceilometer_alarm_notifier_spec.rb
index f0aa78c68065015c1ccfe490cf3dab7a9e19360d..2862e5469b700ad419aa2e7812c9cc960b58515a 100644 (file)
--- a/spec/classes/ceilometer_alarm_notifier_spec.rb
+++ b/spec/classes/ceilometer_alarm_notifier_spec.rb
@@ -24,7 +24,8 @@ describe 'ceilometer::alarm::notifier' do
       is_expected.to contain_package(platform_params[:alarm_notifier_package_name]).with_before('Service[ceilometer-alarm-notifier]')
       is_expected.to contain_package(platform_params[:alarm_notifier_package_name]).with(
         :ensure => 'present',
-        :name   => platform_params[:alarm_notifier_package_name]
+        :name   => platform_params[:alarm_notifier_package_name],
+        :tag    => 'openstack'
       )
     end
 

diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
index 3e148e6261523b9dac013bc133a307a75328add3..7b0c87500c55071649e7d8a7babc7ed17f2a6057 100644 (file)
--- a/spec/classes/ceilometer_api_spec.rb
+++ b/spec/classes/ceilometer_api_spec.rb
@@ -34,7 +34,8 @@ describe 'ceilometer::api' do
     it 'installs ceilometer-api package' do
       is_expected.to contain_package('ceilometer-api').with(
         :ensure => 'latest',
-        :name   => platform_params[:api_package_name]
+        :name   => platform_params[:api_package_name],
+        :tag    => 'openstack',
       )
     end
 

diff --git a/spec/classes/ceilometer_client_spec.rb b/spec/classes/ceilometer_client_spec.rb
index 4c9034aca36b4e660005b8ddf951b95f71d66464..0d0e017868bf8d7fc79a7c85faf3bce78df166e7 100644 (file)
--- a/spec/classes/ceilometer_client_spec.rb
+++ b/spec/classes/ceilometer_client_spec.rb
@@ -9,7 +9,8 @@ describe 'ceilometer::client' do
     it 'installs ceilometer client package' do
       is_expected.to contain_package('python-ceilometerclient').with(
         :ensure => 'present',
-        :name   => platform_params[:client_package_name]
+        :name   => platform_params[:client_package_name],
+        :tag    => 'openstack',
       )
     end
   end

diff --git a/spec/classes/ceilometer_db_spec.rb b/spec/classes/ceilometer_db_spec.rb
index 190473159f4e9d0e11b1b4402f8c9a4c0a3a5ac2..a4c897fd140d3fea3fe392f2573ac36fb39d9b29 100644 (file)
--- a/spec/classes/ceilometer_db_spec.rb
+++ b/spec/classes/ceilometer_db_spec.rb
@@ -18,7 +18,9 @@ describe 'ceilometer::db' do
     it 'installs python-mongodb package' do
       is_expected.to contain_package('ceilometer-backend-package').with(
         :ensure => 'present',
-        :name => 'python-pymongo')
+        :name   => 'python-pymongo',
+        :tag    => 'openstack'
+      )
       is_expected.to contain_ceilometer_config('database/connection').with_value('mongodb://localhost:1234/ceilometer')
       is_expected.to contain_ceilometer_config('database/connection').with_value( params[:database_connection] ).with_secret(true)
     end

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index ca2c783d3d07adc6b97f32959e61f5b056a5aa29..f65edc1d6f08868c4f14eb0a6ea0d875f16032ec 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -107,7 +107,8 @@ describe 'ceilometer' do
     it 'installs ceilometer common package' do
       is_expected.to contain_package('ceilometer-common').with(
         :ensure => 'present',
-        :name   => platform_params[:common_package_name]
+        :name   => platform_params[:common_package_name],
+        :tag    => 'openstack'
       )
     end