openstack/devstack
Code Issues Proposed changes

Revert "Automate OVS bridge creation for multiple mappings"

Browse Source 
After reviewing I5b1d49be8d9e3e331826e30182fba70f099b5e7f and
I161a157895b4ed0c9ea5a7a00302e30f4ad75ed3 - I have come to the
determination that this really should be in a DevStack plugin.

If both of the patches under review were to merge, we would be blessed
with at least the following variables:

OVS_NICS_FROM_BRIDGES
OVS_NIC_MAPPINGS
OVS_BRIDGE_MAPPINGS
OVS_PHYSICAL_BRIDGE
PHYSICAL_NETWORK
PUBLIC_PHYSICAL_NETWORK

Which really is not good. Let's just push this into a plugin, I don't
want to deal with it.

This reverts commit 3095ff5132.

Change-Id: I746022f5db93d3333101a014692fbdcd790a0004
This commit is contained in:
Sean M. Collins 2016-03-15 15:18:14 -04:00
parent 428f86e84f
commit 54d16f706a
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/source/guides/neutron.rst
View File

@ -537,19 +537,3 @@ setup, with small modifications for the interface mappings.
PUBLIC_PHYSICAL_NETWORK=default PUBLIC_PHYSICAL_NETWORK=default
LB_INTERFACE_MAPPINGS=default:eth0 LB_INTERFACE_MAPPINGS=default:eth0
Creating specific OVS bridges for physical networks
---------------------------------------------------
When using the Open vSwitch ML2 mechanism driver, it is possible to
have multiple Open vSwitch bridges meant for physical networking be
automatically created by setting the ``OVS_BRIDGE_MAPPINGS`` to a list of
physical network to bridge name associations with the following syntax:
::
OVS_BRIDGE_MAPPINGS=net1name:bridge1name,net2name:bridge2name,<...>
Also, ``OVS_BRIDGE_MAPPINGS`` has precedence over ``PHYSICAL_NETWORK`` and
``OVS_PHYSICAL_BRIDGE``, meaning that if the former is set, the latter
ones will be ignored. When ``OVS_BRIDGE_MAPPINGS`` is not set, the other
variables will still be evaluated.

11
lib/neutron_plugins/openvswitch_agent
View File

@ -37,7 +37,6 @@ function neutron_plugin_configure_l3_agent {
} }
function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_plugin_agent {
local mappings_array mapping phys_bridge
# Setup integration bridge # Setup integration bridge
_neutron_ovs_base_setup_bridge $OVS_BRIDGE _neutron_ovs_base_setup_bridge $OVS_BRIDGE
_neutron_ovs_base_configure_firewall_driver _neutron_ovs_base_configure_firewall_driver
@ -53,15 +52,9 @@ function neutron_plugin_configure_plugin_agent {
# complex physical network configurations. # complex physical network configurations.
if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
fi
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then # Configure bridge manually with physical interface as port for multi-node
IFS=',' read -a mappings_array <<< "$OVS_BRIDGE_MAPPINGS" _neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE
for mapping in "${mappings_array[@]}"; do
phys_bridge=`echo $mapping | cut -f 2 -d ":"`
# Configure bridge manually with physical interface as port for multi-node
_neutron_ovs_base_add_bridge $phys_bridge
done
fi fi
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings $OVS_BRIDGE_MAPPINGS iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings $OVS_BRIDGE_MAPPINGS