From 9ffa3473fc7d95f3536d1b66cef5fb49545392f1 Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero@redhat.com>
Date: Thu, 28 Jul 2016 01:18:59 -0600
Subject: [PATCH] Fix CONFIG_NEUTRON_L3_EXT_BRIDGE invalid parameter

When CONFIG_NEUTRON_L3_EXT_BRIDGE is set to '' the firewall
settings fail. This patch skips firewall if this condition
is met. Fixes: rhbz#1336433

Change-Id: Ic1d43d8b5fc145f41189f24805719f21138def5b
---
 .../packstack/manifests/provision/bridge.pp   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
index f1cd86f88..24bb42d41 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
@@ -37,18 +37,21 @@ class packstack::provision::bridge ()
         proto    => 'all',
       }
 
-      firewall { '000 forward out':
-        chain    => 'FORWARD',
-        action   => 'accept',
-        outiface => $public_bridge_name,
-        proto    => 'all',
-      }
 
-      firewall { '000 forward in':
-        chain   => 'FORWARD',
-        action  => 'accept',
-        iniface => $public_bridge_name,
-        proto   => 'all',
+      if $public_bridge_name != '' {
+        firewall { '000 forward out':
+          chain    => 'FORWARD',
+          action   => 'accept',
+          outiface => $public_bridge_name,
+          proto    => 'all',
+        }
+
+        firewall { '000 forward in':
+          chain   => 'FORWARD',
+          action  => 'accept',
+          iniface => $public_bridge_name,
+          proto   => 'all',
+        }
       }
     }
 }