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.

(cherry picked from commit a791baa616668e8b7ce12e49d7f918a52293b74f)
(cherry picked from commit 22abe647e6c54c8877245912d35da44a694edf04)
Closes-bug: #1737418
Change-Id: I3813f0918c8394ef14959be7580bf026314ba82e

diff --git a/manifests/collector.pp b/manifests/collector.pp
index 10d3d8a90f45d60649a9b00949ac565b827835ed..368f150676c1838b54bfdbc55a9fe50dce3586a8 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -64,8 +64,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);
   }
 
   Package[$::ceilometer::params::collector_package_name] -> Service['ceilometer-collector']

diff --git a/releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml b/releasenotes/notes/fix-dispatcher-params-fe916b43ffa5aeab.yaml
new file mode 100644 (file)
index 0000000..977cf16
--- /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 4763ae89203fa994089807a1f5bce447c2ee8ae7..338c264d39d876d7ad9c020b60c57127c168090f 100644 (file)
--- 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('<SERVICE DEFAULT>')
-        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