fix broken join that stops polling service from starting

Closes-Bug: 1620449

Change-Id: Ice57bcf767d243729a08af790c1597972dd9cb5c

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index ab5f02ef042d7d59792e7385123fd99f376d2a99..e2d786c1869a8fdd5833437c45f15ddb4b7e740a 100644 (file)
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -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,

diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index 5dda81429312221d5ecb84532150a93eb8c2bc1d..3280a172f177276331e4022d24aea2fb0e79aeb4 100644 (file)
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -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!({