Browse code
Merge "ovs_base: Fix debug-agent config for Q_USE_PROVIDERNET_FOR_PUBLIC=True"
Jenkins authored on 2014/11/26 13:20:05Showing 1 changed files
| ... | ... |
@@ -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 {
|