From 615e115474a570a9d3b7f6edfec365d1bbd31dc3 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 23 Feb 2017 10:41:51 +0000 Subject: [PATCH] lib/neutron: set variables needed for sane l3 agent setup Since for the new devstack library we still rely on some functions from ovs_base, we need to initialize them with sane default values so that setup works as intended and as lib/neutron-legacy behaves by default for external connectivity setup. Change-Id: I412ed4f988b8e03a3e3a08066375b55a6e6aa3e6 --- lib/neutron | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/neutron b/lib/neutron index d80e9d90a1..10f488de90 100644 --- a/lib/neutron +++ b/lib/neutron @@ -70,6 +70,14 @@ NEUTRON_ROOTWRAP=$(get_rootwrap_location neutron) NEUTRON_ROOTWRAP_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf NEUTRON_ROOTWRAP_DAEMON_CMD="sudo $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} +PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500} + # Additional neutron api config files declare -a _NEUTRON_SERVER_EXTRA_CONF_FILES_ABS