openstack/devstack
Code Issues Proposed changes

Revert "Fix devstack with linuxbridge without l3 agent"

Browse Source 
I am seeing red all over the linuxbridge gate.

This reverts commit 7f95baa570.

Change-Id: I179f761f991db4b63c0e3445a9a13e43ffe68992
This commit is contained in:
Armando Migliaccio 2016-11-29 23:30:18 +00:00
parent 7f95baa570
commit 6653d74fc4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_plugins/linuxbridge_agent
View File

@ -62,9 +62,7 @@ function neutron_plugin_configure_plugin_agent {
LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
fi
if [[ "$PUBLIC_BRIDGE" != "" ]] && [[ "$PUBLIC_PHYSICAL_NETWORK" != "" ]]; then
if is_service_enabled neutron-l3; then
iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
fi
iniset /$Q_PLUGIN_CONF_FILE linux_bridge bridge_mappings "$PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE"
fi
if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE linux_bridge physical_interface_mappings $LB_INTERFACE_MAPPINGS