openstack/puppet-ceilometer
Code Issues Proposed changes

polling: Ensure unused parameters are cleared

Browse Source 
... instead of leaving the parameters unmanaged.

Change-Id: I0eeb25b131385ad4448fc8cec04efbdce0b7d87a
This commit is contained in:
Takashi Kajinami
2022-05-04 00:48:48 +09:00
parent b5f4557ee1
commit 2c48365980
2 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/agent/polling.pp
View File

@@ -103,7 +103,7 @@ class ceilometer::agent::polling (
if $central_namespace { if $central_namespace {
$central_namespace_name = 'central' $central_namespace_name = 'central'
} else { } else {
$central_namespace_name = '' $central_namespace_name = undef
} }
if $compute_namespace { if $compute_namespace {
@@ -129,27 +129,39 @@ class ceilometer::agent::polling (
'compute/resource_cache_expiry': value => $resource_cache_expiry; 'compute/resource_cache_expiry': value => $resource_cache_expiry;
} }
} else { } else {
$compute_namespace_name = '' $compute_namespace_name = undef
ceilometer_config {
'compute/instance_discovery_method': ensure => absent;
'compute/resource_update_interval': ensure => absent;
'compute/resource_cache_expiry': ensure => absent;
}
} }
if $ipmi_namespace { if $ipmi_namespace {
$ipmi_namespace_name = 'ipmi' $ipmi_namespace_name = 'ipmi'
} else { } else {
$ipmi_namespace_name = '' $ipmi_namespace_name = undef
} }
$namespaces = delete([$central_namespace_name, $compute_namespace_name, $ipmi_namespace_name], '')
$namespaces_real = inline_template('<%= @namespaces.select { |x| x and x !~ /^undef/ }.compact.join "," %>')
package { 'ceilometer-polling': package { 'ceilometer-polling':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ceilometer::params::agent_polling_package_name, name => $::ceilometer::params::agent_polling_package_name,
tag => ['openstack', 'ceilometer-package'], tag => ['openstack', 'ceilometer-package'],
} }
if $namespaces_real { $namespaces_real = delete_undef_values([
$central_namespace_name,
$compute_namespace_name,
$ipmi_namespace_name
])
if empty($namespaces_real) {
ceilometer_config { ceilometer_config {
'DEFAULT/polling_namespaces': value => $namespaces_real 'DEFAULT/polling_namespaces': ensure => absent
}
} else {
ceilometer_config {
'DEFAULT/polling_namespaces': value => join($namespaces_real, ',')
} }
} }

33
spec/classes/ceilometer_agent_polling_spec.rb
View File

@@ -82,15 +82,44 @@ describe 'ceilometer::agent::polling' do
} }
end end
context 'with compute namespace disabled' do
before do
params.merge!(
:compute_namespace => false
)
end
it {
should contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('central,ipmi')
should contain_ceilometer_config('compute/instance_discovery_method').with_ensure('absent')
should contain_ceilometer_config('compute/resource_update_interval').with_ensure('absent')
should contain_ceilometer_config('compute/resource_cache_expiry').with_ensure('absent')
}
end
context 'with central and ipmi polling namespaces disabled' do context 'with central and ipmi polling namespaces disabled' do
before do before do
params.merge!( :central_namespace => false, params.merge!(
:ipmi_namespace => false ) :central_namespace => false,
:ipmi_namespace => false
)
end end
it { should contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('compute') } it { should contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('compute') }
end end
context 'with all namespaces disabled' do
before do
params.merge!(
:compute_namespace => false,
:central_namespace => false,
:ipmi_namespace => false
)
end
it { should contain_ceilometer_config('DEFAULT/polling_namespaces').with_ensure('absent') }
end
context 'with service disabled' do context 'with service disabled' do
before do before do
params.merge!( :enabled => false ) params.merge!( :enabled => false )