openstack/devstack
Code Issues Proposed changes

Add OVN_BRIDGE_MAPPINGS - support extra bridge

Browse Source 
Add's the OVN_BRIDGE_MAPPINGS variable to ovn_agent.
Uses the same format as OVS_BRIDGE_MAPPINGS, it defaults
to "$PYSICAL_NETWORK:$PUBLIC_BRIDGE".

This enables use of providernet for public network and
setting up additional bridges, for example a for baremetal.

Example:
  Q_USE_PROVIDER_NETWORKING="True"
  OVS_PHYSICAL_BRIDGE="brbm"
  PHYSICAL_NETWORK="mynetwork"
  PUBLIC_PHYSICAL_NETWORK="public"
  PUBLIC_BRIDGE="br-ex"
  OVN_BRIDGE_MAPPINGS="public:br-ex,mynetwork:brbm"

Change-Id: I37317251bbe95d64de06d6232c2d472a98c0ee4d
This commit is contained in:
Harald Jensås 2023-08-31 15:06:52 +02:00
parent ffc1b76f64
commit 16ac21f0da
No known key found for this signature in database
GPG Key ID: 693852E00DCEA408
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron
View File

@ -303,6 +303,11 @@ else
Q_USE_SECGROUP=False Q_USE_SECGROUP=False
fi fi
# OVN_BRIDGE_MAPPINGS - ovn-bridge-mappings
# NOTE(hjensas): Initialize after sourcing neutron_plugins/services/l3
# which initialize PUBLIC_BRIDGE.
OVN_BRIDGE_MAPPINGS=${OVN_BRIDGE_MAPPINGS:-$PHYSICAL_NETWORK:$PUBLIC_BRIDGE}
# Save trace setting # Save trace setting
_XTRACE_NEUTRON=$(set +o | grep xtrace) _XTRACE_NEUTRON=$(set +o | grep xtrace)
set +o xtrace set +o xtrace

2
lib/neutron_plugins/ovn_agent
View File

@ -288,7 +288,7 @@ function clone_repository {
function create_public_bridge { function create_public_bridge {
# Create the public bridge that OVN will use # Create the public bridge that OVN will use
sudo ovs-vsctl --may-exist add-br $PUBLIC_BRIDGE -- set bridge $PUBLIC_BRIDGE protocols=OpenFlow13,OpenFlow15 sudo ovs-vsctl --may-exist add-br $PUBLIC_BRIDGE -- set bridge $PUBLIC_BRIDGE protocols=OpenFlow13,OpenFlow15
sudo ovs-vsctl set open . external-ids:ovn-bridge-mappings=$PHYSICAL_NETWORK:$PUBLIC_BRIDGE sudo ovs-vsctl set open . external-ids:ovn-bridge-mappings=${OVN_BRIDGE_MAPPINGS}
_configure_public_network_connectivity _configure_public_network_connectivity
} }

8
lib/neutron_plugins/services/l3
View File

@ -47,7 +47,8 @@ Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-True}
# used for the network. In case of ofagent, you should add the # used for the network. In case of ofagent, you should add the
# corresponding entry to your OFAGENT_PHYSICAL_INTERFACE_MAPPINGS. # corresponding entry to your OFAGENT_PHYSICAL_INTERFACE_MAPPINGS.
# For openvswitch agent, you should add the corresponding entry to # For openvswitch agent, you should add the corresponding entry to
# your OVS_BRIDGE_MAPPINGS. # your OVS_BRIDGE_MAPPINGS and for OVN add the corresponding entry
# to your OVN_BRIDGE_MAPPINGS.
# #
# eg. (ofagent) # eg. (ofagent)
# Q_USE_PROVIDERNET_FOR_PUBLIC=True # Q_USE_PROVIDERNET_FOR_PUBLIC=True
@ -60,6 +61,11 @@ Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-True}
# PUBLIC_PHYSICAL_NETWORK=public # PUBLIC_PHYSICAL_NETWORK=public
# OVS_BRIDGE_MAPPINGS=public:br-ex # OVS_BRIDGE_MAPPINGS=public:br-ex
# #
# eg. (ovn agent)
# Q_USER_PROVIDERNET_FOR_PUBLIC=True
# PUBLIC_PHYSICAL_NETWORK=public
# OVN_BRIDGE_MAPPINGS=public:br-ex
#
# The provider-network-type defaults to flat, however, the values # The provider-network-type defaults to flat, however, the values
# PUBLIC_PROVIDERNET_TYPE and PUBLIC_PROVIDERNET_SEGMENTATION_ID could # PUBLIC_PROVIDERNET_TYPE and PUBLIC_PROVIDERNET_SEGMENTATION_ID could
# be set to specify the parameters for an alternate network type. # be set to specify the parameters for an alternate network type.