From: Matthew J. Black <mjblack@gmail.com>
Date: Fri, 23 Sep 2016 23:27:04 +0000 (-0400)
Subject: Remove blank values in namespaces array.
X-Git-Tag: 8.3.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ebc384ab39185d0c60a2836521fee0990e97d400;p=puppet-modules%2Fpuppet-ceilometer.git

Remove blank values in namespaces array.

The inline template is using compact which is not removing
the blank values. A call to delete function from stdlib is
needed to remove the blank values.

Change-Id: I7cf3ca383572d569a7e89431dcc39385605cf820
(cherry picked from commit 4e576d3f5393cb58b2d19b940d9a3c3d81144417)
---

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 63317fd..d58675f 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -76,8 +76,8 @@ 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 = delete([$central_namespace_name, $compute_namespace_name, $ipmi_namespace_name], '')
+  $namespaces_real = inline_template('<%= @namespaces.select { |x| x and x !~ /^undef/ }.compact.join "," %>')
 
   package { 'ceilometer-polling':
     ensure => $package_ensure,
diff --git a/releasenotes/notes/fix_polling_agent_namespaces-6a79b7e42601f950.yaml b/releasenotes/notes/fix_polling_agent_namespaces-6a79b7e42601f950.yaml
new file mode 100644
index 0000000..c14a0f0
--- /dev/null
+++ b/releasenotes/notes/fix_polling_agent_namespaces-6a79b7e42601f950.yaml
@@ -0,0 +1,3 @@
+---
+issues:
+  - Delete blank values from ceilometer::agent::polling namespaces array.