From bbf0a02e2f9c1e29cc62b3fa133c67abb01afc9d Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Fri, 1 Jul 2016 11:22:00 +0200 Subject: [PATCH] Fix LinuxBridge support https://review.openstack.org/307403 added a regression in LinuxBridge support, as it always used the ovs_type variable, which was only set when OVS was used. Change-Id: I80da8d999ece2fd4c5a4f7ad801d56236a30664e Closes-Bug: #1597653 --- packstack/plugins/neutron_350.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py index 41125a712..78ded7b3a 100644 --- a/packstack/plugins/neutron_350.py +++ b/packstack/plugins/neutron_350.py @@ -813,15 +813,13 @@ def create_l2_agent_manifests(config, messages): config["CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS_COMPUTE"] = mapp_arr_cmp config["CONFIG_NEUTRON_OVS_BRIDGE_IFACES_COMPUTE"] = [] - + no_local_types = set(ovs_type) & set(['gre', 'vxlan', 'vlan', 'flat']) + no_tunnel_types = set(ovs_type) & set(['vlan', 'flat']) elif agent == "linuxbridge": host_var = 'CONFIG_NEUTRON_LB_HOST' else: raise KeyError("Unknown layer2 agent") - no_local_types = set(ovs_type) & set(['gre', 'vxlan', 'vlan', 'flat']) - no_tunnel_types = set(ovs_type) & set(['vlan', 'flat']) - for host in network_hosts | compute_hosts: # NICs connected to OVS bridges can be required in network nodes if # vlan, flat, vxlan or gre are enabled. For compute nodes, they are