Skip to content

Commit faaf96b

Browse files
author
Hongbin Lu
committed
remove external_network_bridge option
The external_network_bridge option is deprecated/legacy and being removed from neutron (see I07474713206c218710544ad98c08caaa37dbf53a). This patch removes the external_network_bridge option iniset from devstack scripts. Change-Id: I4d9641cc9bb83719c9af1edabb89a63c4c2b1d96
1 parent 66ca7f5 commit faaf96b

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

lib/neutron

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ NEUTRON_ROOTWRAP_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
9595
NEUTRON_ROOTWRAP_CMD="$NEUTRON_ROOTWRAP $NEUTRON_ROOTWRAP_CONF_FILE"
9696
NEUTRON_ROOTWRAP_DAEMON_CMD="$NEUTRON_ROOTWRAP-daemon $NEUTRON_ROOTWRAP_CONF_FILE"
9797

98-
# This is needed because _neutron_ovs_base_configure_l3_agent will set
99-
# external_network_bridge
100-
Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-True}
10198
# This is needed because _neutron_ovs_base_configure_l3_agent uses it to create
10299
# an external network bridge
103100
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}

lib/neutron_plugins/ovs_base

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ function _neutron_ovs_base_configure_firewall_driver {
9696
}
9797

9898
function _neutron_ovs_base_configure_l3_agent {
99-
if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" != "True" ]; then
100-
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
101-
fi
102-
10399
neutron-ovs-cleanup --config-file $NEUTRON_CONF
104100
if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then
105101
ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||

0 commit comments

Comments
 (0)