Browse Source

Fix dispatcher params

Currently we join the params and pass in a string to the dispatcher
settings. This wont work as ceilometer config expects separate
lines for each value.

Change-Id: I3813f0918c8394ef14959be7580bf026314ba82e
changes/18/453318/2
Pradeep Kilambi 5 years ago
parent
commit
a791baa616
  1. 4
      manifests/collector.pp
  2. 4
      releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml
  3. 4
      spec/classes/ceilometer_collector_spec.rb

4
manifests/collector.pp

@ -94,8 +94,8 @@ class ceilometer::collector (
'collector/udp_address': value => $udp_address;
'collector/udp_port': value => $udp_port;
'collector/workers': value => $collector_workers;
'DEFAULT/meter_dispatchers': value => join(any2array($meter_dispatchers_real), ',');
'DEFAULT/event_dispatchers': value => join(any2array($event_dispatchers_real), ',');
'DEFAULT/meter_dispatchers': value => any2array($meter_dispatchers_real);
'DEFAULT/event_dispatchers': value => any2array($event_dispatchers_real);
}
ensure_resource( 'package', [$::ceilometer::params::collector_package_name],

4
releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml

@ -0,0 +1,4 @@
---
fixes:
- Fix dispatcher params to not convert the array into string. This way
its compatible with service defaults.

4
spec/classes/ceilometer_collector_spec.rb

@ -52,8 +52,8 @@ describe 'ceilometer::collector' do
is_expected.to contain_ceilometer_config('collector/udp_address').with_value( '0.0.0.0' )
is_expected.to contain_ceilometer_config('collector/udp_port').with_value( '4952' )
is_expected.to contain_ceilometer_config('collector/workers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('DEFAULT/meter_dispatchers').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_ceilometer_config('DEFAULT/event_dispatchers').with_value( '<SERVICE DEFAULT>' )
is_expected.to contain_ceilometer_config('DEFAULT/meter_dispatchers').with_value( ['<SERVICE DEFAULT>'] )
is_expected.to contain_ceilometer_config('DEFAULT/event_dispatchers').with_value( ['<SERVICE DEFAULT>'] )
end
it 'installs ceilometer-collector package' do

Loading…
Cancel
Save