x/packstack
Code Issues Proposed changes

Make sure bridge provision is disabled for Nova network

Browse Source 
Currently CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE values are undeterministic
and can have (true|y) and (false|n) values. This is temporary fix and we will
need to create more robust fix for boolean parameters in the future.

Change-Id: I18c37e5f277e0117c94867fe8e8ef727db73b77f
Fixes: rhbz#1115444
This commit is contained in:
Martin Magr
2014-07-02 13:16:54 +02:00
parent 84145be5bc
commit a7a490ad1f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packstack/plugins/postscript_948.py
View File

@@ -45,7 +45,13 @@ def create_manifest(config, messages):
manifestfile = "%s_postscript.pp" % hostname manifestfile = "%s_postscript.pp" % hostname
manifestdata = getManifestTemplate("postscript.pp") manifestdata = getManifestTemplate("postscript.pp")
appendManifestFile(manifestfile, manifestdata, 'postscript') appendManifestFile(manifestfile, manifestdata, 'postscript')
if config.get("CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE") != 'false': # TO-DO: remove this temporary fix for nova-network/neutron
# undeterministic behavior
provision = (
config.get("CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE") not in
set(['false', 'n', None])
)
if config.get('CONFIG_NEUTRON_INSTALL', 'n') == 'y' and provision:
fmted = config['CONFIG_NEUTRON_L3_EXT_BRIDGE'].replace('-', '_') fmted = config['CONFIG_NEUTRON_L3_EXT_BRIDGE'].replace('-', '_')
config['EXT_BRIDGE_VAR'] = fmted config['EXT_BRIDGE_VAR'] = fmted
manifestdata = getManifestTemplate("persist_ovs_bridge.pp") manifestdata = getManifestTemplate("persist_ovs_bridge.pp")