Browse code

Merge "lib/neutron: set variables needed for sane l3 agent setup"

Jenkins authored on 2017/03/13 21:57:17
Showing 1 changed files
... ...
@@ -74,6 +74,14 @@ NEUTRON_ROOTWRAP=$(get_rootwrap_location neutron)
74 74
 NEUTRON_ROOTWRAP_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf
75 75
 NEUTRON_ROOTWRAP_DAEMON_CMD="sudo $NEUTRON_ROOTWRAP-daemon $NEUTRON_ROOTWRAP_CONF_FILE"
76 76
 
77
+# This is needed because _neutron_ovs_base_configure_l3_agent will set
78
+# external_network_bridge
79
+Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-True}
80
+# This is needed because _neutron_ovs_base_configure_l3_agent uses it to create
81
+# an external network bridge
82
+PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
83
+PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500}
84
+
77 85
 # Additional neutron api config files
78 86
 declare -a -g _NEUTRON_SERVER_EXTRA_CONF_FILES_ABS
79 87