Browse code
Revert "Automate OVS bridge creation for multiple mappings"
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 3095ff51320291b3622cacc3bf2fb1043bff8d31.
Change-Id: I746022f5db93d3333101a014692fbdcd790a0004
Sean M. Collins authored on 2016/03/16 04:18:14Showing 2 changed files
| ... | ... |
@@ -537,19 +537,3 @@ setup, with small modifications for the interface mappings. |
| 537 | 537 |
PUBLIC_PHYSICAL_NETWORK=default |
| 538 | 538 |
LB_INTERFACE_MAPPINGS=default:eth0 |
| 539 | 539 |
|
| 540 |
-Creating specific OVS bridges for physical networks |
|
| 541 |
- |
|
| 542 |
-When using the Open vSwitch ML2 mechanism driver, it is possible to |
|
| 543 |
-have multiple Open vSwitch bridges meant for physical networking be |
|
| 544 |
-automatically created by setting the ``OVS_BRIDGE_MAPPINGS`` to a list of |
|
| 545 |
-physical network to bridge name associations with the following syntax: |
|
| 546 |
- |
|
| 547 |
-:: |
|
| 548 |
- |
|
| 549 |
- OVS_BRIDGE_MAPPINGS=net1name:bridge1name,net2name:bridge2name,<...> |
|
| 550 |
- |
|
| 551 |
-Also, ``OVS_BRIDGE_MAPPINGS`` has precedence over ``PHYSICAL_NETWORK`` and |
|
| 552 |
-``OVS_PHYSICAL_BRIDGE``, meaning that if the former is set, the latter |
|
| 553 |
-ones will be ignored. When ``OVS_BRIDGE_MAPPINGS`` is not set, the other |
|
| 554 |
-variables will still be evaluated. |
| ... | ... |
@@ -37,7 +37,6 @@ function neutron_plugin_configure_l3_agent {
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
function neutron_plugin_configure_plugin_agent {
|
| 40 |
- local mappings_array mapping phys_bridge |
|
| 41 | 40 |
# Setup integration bridge |
| 42 | 41 |
_neutron_ovs_base_setup_bridge $OVS_BRIDGE |
| 43 | 42 |
_neutron_ovs_base_configure_firewall_driver |
| ... | ... |
@@ -53,15 +52,9 @@ function neutron_plugin_configure_plugin_agent {
|
| 53 | 53 |
# complex physical network configurations. |
| 54 | 54 |
if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then |
| 55 | 55 |
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE |
| 56 |
- fi |
|
| 57 | 56 |
|
| 58 |
- if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then |
|
| 59 |
- IFS=',' read -a mappings_array <<< "$OVS_BRIDGE_MAPPINGS" |
|
| 60 |
- for mapping in "${mappings_array[@]}"; do
|
|
| 61 |
- phys_bridge=`echo $mapping | cut -f 2 -d ":"` |
|
| 62 |
- # Configure bridge manually with physical interface as port for multi-node |
|
| 63 |
- _neutron_ovs_base_add_bridge $phys_bridge |
|
| 64 |
- done |
|
| 57 |
+ # Configure bridge manually with physical interface as port for multi-node |
|
| 58 |
+ _neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE |
|
| 65 | 59 |
fi |
| 66 | 60 |
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then |
| 67 | 61 |
iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings $OVS_BRIDGE_MAPPINGS |