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>
This commit is contained in:
parent
b2e352b9c1
commit
8d17c36818
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -96,6 +96,7 @@ class ceilometer::api (
|
|||
package { 'ceilometer-api':
|
||||
ensure => $package_ensure,
|
||||
name => $::ceilometer::params::api_package_name,
|
||||
tag => 'openstack',
|
||||
}
|
||||
|
||||
if $manage_service {
|
||||
|
|
|
@ -14,6 +14,7 @@ class ceilometer::client (
|
|||
package { 'python-ceilometerclient':
|
||||
ensure => $ensure,
|
||||
name => $::ceilometer::params::client_package_name,
|
||||
tag => 'openstack',
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -59,6 +59,7 @@ class ceilometer::db (
|
|||
package {'ceilometer-backend-package':
|
||||
ensure => present,
|
||||
name => $backend_package,
|
||||
tag => 'openstack',
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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<||>
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue