From 22abe647e6c54c8877245912d35da44a694edf04 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 4 Apr 2017 15:55:43 -0400 Subject: [PATCH] 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 (cherry picked from commit a791baa616668e8b7ce12e49d7f918a52293b74f) --- manifests/collector.pp | 4 ++-- .../notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml | 4 ++++ spec/classes/ceilometer_collector_spec.rb | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml diff --git a/manifests/collector.pp b/manifests/collector.pp index e6041eae..70b27077 100644 --- a/manifests/collector.pp +++ b/manifests/collector.pp @@ -63,8 +63,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_dispatcher), ','); - 'DEFAULT/event_dispatchers': value => join(any2array($event_dispatcher), ','); + 'DEFAULT/meter_dispatchers': value => any2array($meter_dispatcher); + 'DEFAULT/event_dispatchers': value => any2array($event_dispatcher); } ensure_resource( 'package', [$::ceilometer::params::collector_package_name], diff --git a/releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml b/releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml new file mode 100644 index 00000000..977cf161 --- /dev/null +++ b/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. diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb index 1316dfb6..366c22a2 100644 --- a/spec/classes/ceilometer_collector_spec.rb +++ b/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('') - is_expected.to contain_ceilometer_config('DEFAULT/meter_dispatchers').with_value( 'database' ) - is_expected.to contain_ceilometer_config('DEFAULT/event_dispatchers').with_value( 'database' ) + is_expected.to contain_ceilometer_config('DEFAULT/meter_dispatchers').with_value( ['database'] ) + is_expected.to contain_ceilometer_config('DEFAULT/event_dispatchers').with_value( ['database'] ) end it 'installs ceilometer-collector package' do