x/packstack
Code Issues Proposed changes

Fix LinuxBridge support

Browse Source 
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
This commit is contained in:
Javier Pena
2016-07-01 11:22:00 +02:00
parent 2b29648d20
commit bbf0a02e2f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/plugins/neutron_350.py
View File

@@ -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