openstack/puppet-ceilometer
Code Issues Proposed changes

fix broken join that stops polling service from starting

Browse Source 
Closes-Bug: 1620449

Change-Id: Ice57bcf767d243729a08af790c1597972dd9cb5c
This commit is contained in:
Marcus Furlong
2016-09-06 22:44:22 +10:00
committed by Alex Schultz
parent ebe1a452a1
commit ff327ffa3a
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agent/polling.pp
View File

@@ -79,7 +79,7 @@ class ceilometer::agent::polling (
}
$namespaces = [$central_namespace_name, $compute_namespace_name, $ipmi_namespace_name]
$namespaces_real = inline_template('<%= @namespaces.find_all {|x| x !~ /^undef/ }.join "," %>')
$namespaces_real = inline_template('<%= @namespaces.select { |x| x and x !~ /^undef/ }.compact.join "," %>')
package { 'ceilometer-polling':
ensure => $package_ensure,

14
spec/classes/ceilometer_agent_polling_spec.rb
View File

@@ -48,7 +48,7 @@ describe 'ceilometer::agent::polling' do
)
end
it 'configures central agent' do
it 'configures polling namespaces' do
is_expected.to contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('central,compute,ipmi')
end
@@ -77,6 +77,18 @@ describe 'ceilometer::agent::polling' do
end
end
context 'with central and ipmi polling namespaces disabled' do
before do
params.merge!({
:central_namespace => false,
:ipmi_namespace => false })
end
it 'configures compute polling namespace' do
is_expected.to contain_ceilometer_config('DEFAULT/polling_namespaces').with_value('compute')
end
end
context 'with disabled service managing' do
before do
params.merge!({