1. devstack
  2. Commit 98a0ad44722182453a74872c93c904d35bcac708
Browse code

ovs_base: Fix debug-agent config for Q_USE_PROVIDERNET_FOR_PUBLIC=True

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

This is an oversight in commit 6a633fd024347aade777ecd6545fa3efde5a959c.

Closes-Bug: #1394826
Change-Id: I33f0fe15bafb7071d8a09899d636471f49031606

YAMAMOTO Takashi authored on 2014/11/21 10:42:18
Showing 1 changed files
lib/neutron_plugins/ovs_base
History View file @ 98a0ad4
... ... 
@@ -60,7 +60,11 @@ function _neutron_ovs_base_install_agent_packages {
60 60 
 }
61 61
62 62 
 function _neutron_ovs_base_configure_debug_command {
63 
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
63 
+    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then
64 
+        iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge ""
65 
+    else
66 
+        iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
67 
+    fi
64 68 
 }
65 69
66 70 
 function _neutron_ovs_base_configure_firewall_driver {