1. devstack
  2. Commit e3e9ea299601665a295e31a98e90dd9587165850
Browse code

Revert "remove external_network_bridge option"

This reverts commit faaf96bfb15c5f4c45a72b149dc6fe1e1f907a71.

Ironic jobs were still using this option, it needs to be
switched to an alternative first.

Change-Id: I1683d7cfa81f5fe2497cc7045e87f8b20fed4968

Derek Higgins authored on 2018/11/10 00:43:13
Showing 2 changed files
lib/neutron
History View file @ e3e9ea2
... ... 
@@ -95,6 +95,9 @@ NEUTRON_ROOTWRAP_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
95 95 
 NEUTRON_ROOTWRAP_CMD="$NEUTRON_ROOTWRAP $NEUTRON_ROOTWRAP_CONF_FILE"
96 96 
 NEUTRON_ROOTWRAP_DAEMON_CMD="$NEUTRON_ROOTWRAP-daemon $NEUTRON_ROOTWRAP_CONF_FILE"
97 97
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}
98 101 
 # This is needed because _neutron_ovs_base_configure_l3_agent uses it to create
99 102 
 # an external network bridge
100 103 
 PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
lib/neutron_plugins/ovs_base
History View file @ e3e9ea2
... ... 
@@ -96,6 +96,10 @@ function _neutron_ovs_base_configure_firewall_driver {
96 96 
 }
97 97
98 98 
 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 
+
99 103 
     neutron-ovs-cleanup --config-file $NEUTRON_CONF
100 104 
     if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then
101 105 
         ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||