openstack/devstack
Code Issues Proposed changes

Merge "Don't set external_network_bridge by default"

Browse Source
This commit is contained in:
Jenkins 2017-02-24 12:00:44 +00:00 committed by Gerrit Code Review
commit 10e1e387ce
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/neutron_plugins/brocade
View File

@ -54,7 +54,6 @@ function neutron_plugin_configure_dhcp_agent {
} }
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
} }

1
lib/neutron_plugins/linuxbridge_agent
View File

@ -48,7 +48,6 @@ function neutron_plugin_configure_l3_agent {
local conf_file=$1 local conf_file=$1
sudo brctl addbr $PUBLIC_BRIDGE sudo brctl addbr $PUBLIC_BRIDGE
set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
iniset $conf_file DEFAULT external_network_bridge
} }
function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_plugin_agent {

4
lib/neutron_plugins/ovs_base
View File

@ -87,9 +87,7 @@ function _neutron_ovs_base_configure_firewall_driver {
} }
function _neutron_ovs_base_configure_l3_agent { function _neutron_ovs_base_configure_l3_agent {
if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" != "True" ]; then
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge ""
else
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
fi fi