From: Dan Prince <dprince@redhat.com>
Date: Tue, 4 Oct 2016 14:11:55 +0000 (-0400)
Subject: Cleanup the firewall logic.
X-Git-Tag: opnfv-6.0.0~552
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=39c9c6508a43b7c705f4f206e1093080c921b7d6;p=apex-puppet-tripleo.git

Cleanup the firewall logic.

We added code in t-h-t to strip empty services from the service_names
list. (These are often the result of a service set to OS::Heat::None).

As such we can now drop this puppet reject statement.

Change-Id: Ie66f14f183de7e44a1f69af862f7d4be9a14c904
---

diff --git a/manifests/firewall.pp b/manifests/firewall.pp
index edcb5e7..3184cd3 100644
--- a/manifests/firewall.pp
+++ b/manifests/firewall.pp
@@ -102,7 +102,7 @@ class tripleo::firewall(
     #     dport: 999
     #     proto: udp
     #     action: accept
-    $service_names = reject(hiera('service_names', []), '^$')
+    $service_names = hiera('service_names', [])
     tripleo::firewall::service_rules { $service_names: }
   }