openstack/devstack
Code Issues Proposed changes

Create OVS bridge even if OVS_BRIDGE_MAPPINGS is not empty

Browse Source 
in complex cases when mapping is defined in local.conf OVS bridge
can be created automatically.

Change-Id: I2e5e1068e77291d1d199cd698cec4946480c7601
This commit is contained in:
Lenny Verkhovsky 2019-11-12 15:54:32 +02:00
parent 1a6c22e489
commit d6a7b73fc8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/neutron_plugins/openvswitch_agent
View File

@ -41,8 +41,10 @@ function neutron_plugin_configure_plugin_agent {
# Setup physical network bridge mappings. Override # Setup physical network bridge mappings. Override
# ``OVS_VLAN_RANGES`` and ``OVS_BRIDGE_MAPPINGS`` in ``localrc`` for more # ``OVS_VLAN_RANGES`` and ``OVS_BRIDGE_MAPPINGS`` in ``localrc`` for more
# complex physical network configurations. # complex physical network configurations.
if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then if [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]]; then
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
fi
# Configure bridge manually with physical interface as port for multi-node # Configure bridge manually with physical interface as port for multi-node
_neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE _neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE