From acfacd7fc3121f7327d31208bbd7452ec6725598 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Thu, 1 Aug 2013 09:58:01 -0500 Subject: [PATCH] Don't access iface_arr unless using OVS Change-Id: I3829f4aeb9d8072597fa68a71280c5444c2ab34e --- packstack/plugins/quantum_350.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packstack/plugins/quantum_350.py b/packstack/plugins/quantum_350.py index 3eed72814..4075d642c 100644 --- a/packstack/plugins/quantum_350.py +++ b/packstack/plugins/quantum_350.py @@ -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