commit 7c3df6b700d9d1dcdb4a2ec9864295f91f30c529
author Zuul <zuul@review.openstack.org> Wed Nov 07 00:35:02 2018 +0000
committer Gerrit Code Review <review@openstack.org> Wed Nov 07 00:35:02 2018 +0000
tree d686dffc7d858bfd39f02d03fe70158310428535
parent a61b4704871e7b0ae88a50932576e961eca615e4
parent faaf96bfb15c5f4c45a72b149dc6fe1e1f907a71

Merge "remove external_network_bridge option"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 4847e87..4e9691d 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -95,9 +95,6 @@
 NEUTRON_ROOTWRAP_CMD="$NEUTRON_ROOTWRAP $NEUTRON_ROOTWRAP_CONF_FILE"
 NEUTRON_ROOTWRAP_DAEMON_CMD="$NEUTRON_ROOTWRAP-daemon $NEUTRON_ROOTWRAP_CONF_FILE"
 
-# This is needed because _neutron_ovs_base_configure_l3_agent will set
-# external_network_bridge
-Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-True}
 # This is needed because _neutron_ovs_base_configure_l3_agent uses it to create
 # an external network bridge
 PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}

lib/neutron_plugins/ovs_base

diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index 523024e..558a7d5 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -96,10 +96,6 @@
 }
 
 function _neutron_ovs_base_configure_l3_agent {
-    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" != "True" ]; then
-        iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
-    fi
-
     neutron-ovs-cleanup --config-file $NEUTRON_CONF
     if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then
         ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||