summaryrefslogtreecommitdiffstats
path: root/lib/python
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-18 12:11:15 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-18 12:11:15 +0000
commit73e52458f6f22ec453ec08cc0960d8b8e0ce45fe (patch)
treeebb5efde5b0af111c1c2de0b8416cdade7f73266 /lib/python
parentddecb36accd3f229ccee6113ee04b9e623885203 (diff)
parent98fe31feaba1db62445d8a006dd52fd5e12eba1d (diff)
Merge "Fixes public vlan network settings"
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/apex/network_environment.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index bf4bdc79..981c8f1c 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -84,6 +84,7 @@ class NetworkEnvironment:
public_cidr = net_settings[PUBLIC_NETWORK]['cidr']
self.netenv_obj[param_def]['ExternalNetCidr'] = str(public_cidr)
if net_settings[PUBLIC_NETWORK]['vlan'] != 'native':
+ self.netenv_obj[param_def]['NeutronExternalNetworkBridge'] = '""'
self.netenv_obj[param_def]['ExternalNetworkVlanID'] = \
net_settings[PUBLIC_NETWORK]['vlan']
public_range = \