From 8d17c36818d99231a64d20f50ea708d59306fe22 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Sat, 28 Mar 2015 14:05:31 +0100 Subject: [PATCH] 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 --- manifests/agent/central.pp | 1 + manifests/agent/compute.pp | 1 + manifests/agent/notification.pp | 5 ++++- manifests/agent/polling.pp | 1 + manifests/alarm/evaluator.pp | 4 +++- manifests/alarm/notifier.pp | 4 +++- manifests/api.pp | 1 + manifests/client.pp | 1 + manifests/db.pp | 1 + manifests/init.pp | 1 + spec/classes/ceilometer_agent_central_spec.rb | 3 ++- spec/classes/ceilometer_agent_compute_spec.rb | 3 ++- spec/classes/ceilometer_agent_notification_spec.rb | 3 ++- spec/classes/ceilometer_agent_polling_spec.rb | 3 ++- spec/classes/ceilometer_alarm_evaluator_spec.rb | 3 ++- spec/classes/ceilometer_alarm_notifier_spec.rb | 3 ++- spec/classes/ceilometer_api_spec.rb | 3 ++- spec/classes/ceilometer_client_spec.rb | 3 ++- spec/classes/ceilometer_db_spec.rb | 4 +++- spec/classes/ceilometer_init_spec.rb | 3 ++- 20 files changed, 38 insertions(+), 13 deletions(-) diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp index e197b38..5fa5b09 100644 --- 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 2cd02ac..1c48c78 100644 --- 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 de0c954..00702aa 100644 --- 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 209b4ea..a4316af 100644 --- 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 55c922a..29ad75d 100644 --- 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 d4be85c..a07d4d5 100644 --- 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 fd58dde..f2c1e31 100644 --- 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 c02ac3c..5c54639 100644 --- 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 74af799..760d8e5 100644 --- 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 cdfaef7..124eaa1 100644 --- 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 5643e1d..c558762 100644 --- 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 bea0b25..28325b5 100644 --- 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 e1cd8ec..550a755 100644 --- 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 34a0105..2892146 100644 --- 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 b1fe5bc..503956a 100644 --- 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 f0aa78c..2862e54 100644 --- 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 3e148e6..7b0c875 100644 --- 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 4c9034a..0d0e017 100644 --- 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 1904731..a4c897f 100644 --- 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 ca2c783..f65edc1 100644 --- 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 -- 2.45.2