x/packstack
Code Issues Proposed changes

Merge "Don't access iface_arr unless using OVS"

Browse Source
This commit is contained in:
Jenkins 2013-08-06 06:59:24 +00:00 committed by Gerrit Code Review
commit dbb86c4a6e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/plugins/quantum_350.py
View File

@ -410,10 +410,11 @@ def createL2AgentManifests(config):
manifestfile = "%s_quantum.pp" % (host,) manifestfile = "%s_quantum.pp" % (host,)
manifestdata = getManifestTemplate(template_name) manifestdata = getManifestTemplate(template_name)
appendManifestFile(manifestfile, manifestdata + "\n") appendManifestFile(manifestfile, manifestdata + "\n")
for if_map in iface_arr: if controller.CONF["CONFIG_QUANTUM_L2_PLUGIN"] == "openvswitch":
controller.CONF['CONFIG_QUANTUM_OVS_BRIDGE'], controller.CONF['CONFIG_QUANTUM_OVS_IFACE'] = if_map.split(':') for if_map in iface_arr:
manifestdata = getManifestTemplate("quantum_ovs_port.pp") controller.CONF['CONFIG_QUANTUM_OVS_BRIDGE'], controller.CONF['CONFIG_QUANTUM_OVS_IFACE'] = if_map.split(':')
appendManifestFile(manifestfile, manifestdata + "\n") manifestdata = getManifestTemplate("quantum_ovs_port.pp")
appendManifestFile(manifestfile, manifestdata + "\n")
def createMetadataManifests(config): def createMetadataManifests(config):
global meta_hosts global meta_hosts