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
diff --git a/lib/neutron b/lib/neutron
index 4e9691d..4847e87 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -95,6 +95,9 @@
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}