Browse code
Provide configuration file to ovs-cleanup utility
There may be cases when the configuration of the OVS is different
from the default one. This enables one to make use of the neutron
configuration file to contain all of the OVS settings.
Change-Id: I728cf8cdc653667c076b07b39c13c1278281c01b
Closes-bug: #1645691
Gary Kotton authored on 2016/11/29 20:48:34Showing 1 changed files
| ... | ... |
@@ -30,7 +30,7 @@ function _neutron_ovs_base_add_bridge {
|
| 30 | 30 |
|
| 31 | 31 |
function _neutron_ovs_base_setup_bridge {
|
| 32 | 32 |
local bridge=$1 |
| 33 |
- neutron-ovs-cleanup |
|
| 33 |
+ neutron-ovs-cleanup --config-file $NEUTRON_CONF |
|
| 34 | 34 |
_neutron_ovs_base_add_bridge $bridge |
| 35 | 35 |
sudo ovs-vsctl --no-wait br-set-external-id $bridge bridge-id $bridge |
| 36 | 36 |
} |
| ... | ... |
@@ -97,7 +97,7 @@ function _neutron_ovs_base_configure_l3_agent {
|
| 97 | 97 |
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE |
| 98 | 98 |
fi |
| 99 | 99 |
|
| 100 |
- neutron-ovs-cleanup |
|
| 100 |
+ neutron-ovs-cleanup --config-file $NEUTRON_CONF |
|
| 101 | 101 |
if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then |
| 102 | 102 |
ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 || |
| 103 | 103 |
sudo ip link add $Q_PUBLIC_VETH_INT type veth \ |