openstack/devstack
Code Issues Proposed changes

ovs_base: Fix debug-agent config for Q_USE_PROVIDERNET_FOR_PUBLIC=True

Browse Source 
Set up external_network_bridge correctly for the case
of Q_USE_PROVIDERNET_FOR_PUBLIC=True.

This is an oversight in commit 6a633fd024.

Closes-Bug: #1394826
Change-Id: I33f0fe15bafb7071d8a09899d636471f49031606
This commit is contained in:
YAMAMOTO Takashi 2014-11-21 10:42:18 +09:00
parent b103e1abd8
commit 98a0ad4472
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/neutron_plugins/ovs_base
View File

@ -60,7 +60,11 @@ function _neutron_ovs_base_install_agent_packages {
} }
function _neutron_ovs_base_configure_debug_command { function _neutron_ovs_base_configure_debug_command {
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge ""
else
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
fi
} }
function _neutron_ovs_base_configure_firewall_driver { function _neutron_ovs_base_configure_firewall_driver {