Merge "Don't access iface_arr unless using OVS"

This commit is contained in:
Jenkins 2013-08-06 06:59:24 +00:00 committed by Gerrit Code Review
commit dbb86c4a6e

View File

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