Browse code

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

Ihar Hrachyshka authored on 2017/02/23 19:41:51
Showing 1 changed files
... ...
@@ -70,6 +70,14 @@ NEUTRON_ROOTWRAP=$(get_rootwrap_location neutron)
70 70
 NEUTRON_ROOTWRAP_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
71 71
 NEUTRON_ROOTWRAP_DAEMON_CMD="sudo $NEUTRON_ROOTWRAP-daemon $NEUTRON_ROOTWRAP_CONF_FILE"
72 72
 
73
+# This is needed because _neutron_ovs_base_configure_l3_agent will set
74
+# external_network_bridge
75
+Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-True}
76
+# This is needed because _neutron_ovs_base_configure_l3_agent uses it to create
77
+# an external network bridge
78
+PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
79
+PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500}
80
+
73 81
 # Additional neutron api config files
74 82
 declare -a _NEUTRON_SERVER_EXTRA_CONF_FILES_ABS
75 83