openstack/devstack
Code Issues Proposed changes

Merge "ovs_base: Fix debug-agent config for Q_USE_PROVIDERNET_FOR_PUBLIC=True"

Browse Source
This commit is contained in:
Jenkins 2014-11-26 04:20:05 +00:00 committed by Gerrit Code Review
commit a726cc08ad
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 {