1. devstack
  2. Commit 937b96d4a7c8deff63b9f0ea9658ca24bd64a580
Browse code

Merge "Create OVS bridge even if OVS_BRIDGE_MAPPINGS is not empty"

Zuul authored on 2019/12/20 05:08:41
Showing 1 changed files
lib/neutron_plugins/openvswitch_agent
History View file @ 937b96d
... ... 
@@ -41,8 +41,10 @@ function neutron_plugin_configure_plugin_agent {
41 41 
     # Setup physical network bridge mappings.  Override
42 42 
     # ``OVS_VLAN_RANGES`` and ``OVS_BRIDGE_MAPPINGS`` in ``localrc`` for more
43 43 
     # complex physical network configurations.
44 
-    if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
45 
-        OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
44 
+    if [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
45 
+        if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]]; then
46 
+            OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
47 
+        fi
46 48
47 49 
         # Configure bridge manually with physical interface as port for multi-node
48 50 
         _neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE