1. devstack
  2. Commit 10e1e387ce0693b57d882ca6931b366d73ff024b
Browse code

Merge "Don't set external_network_bridge by default"

Jenkins authored on 2017/02/24 21:00:44
Showing 3 changed files
lib/neutron_plugins/brocade
History View file @ 10e1e38
... ... 
@@ -54,7 +54,6 @@ function neutron_plugin_configure_dhcp_agent {
54 54 
 }
55 55
56 56 
 function neutron_plugin_configure_l3_agent {
57 
-    iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
58 57 
     iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
59 58 
 }
60 59
lib/neutron_plugins/linuxbridge_agent
History View file @ 10e1e38
... ... 
@@ -48,7 +48,6 @@ function neutron_plugin_configure_l3_agent {
48 48 
     local conf_file=$1
49 49 
     sudo brctl addbr $PUBLIC_BRIDGE
50 50 
     set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
51 
-    iniset $conf_file DEFAULT external_network_bridge
52 51 
 }
53 52
54 53 
 function neutron_plugin_configure_plugin_agent {
lib/neutron_plugins/ovs_base
History View file @ 10e1e38
... ... 
@@ -87,9 +87,7 @@ function _neutron_ovs_base_configure_firewall_driver {
87 87 
 }
88 88
89 89 
 function _neutron_ovs_base_configure_l3_agent {
90 
-    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then
91 
-        iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge ""
92 
-    else
90 
+    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" != "True" ]; then
93 91 
         iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
94 92 
     fi
95 93