openstack
/
devstack
Code Issues Proposed changes

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
(cherry picked from commit 2a5981402f)
This commit is contained in:
Gary Kotton 2016-11-29 03:48:34 -08:00 committed by garyk
parent 0027c6a232
commit 33b079dc42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_plugins/ovs_base
View File

@ -30,7 +30,7 @@ function _neutron_ovs_base_add_bridge {
function _neutron_ovs_base_setup_bridge {
local bridge=$1
neutron-ovs-cleanup
neutron-ovs-cleanup --config-file $NEUTRON_CONF
_neutron_ovs_base_add_bridge $bridge
sudo ovs-vsctl --no-wait br-set-external-id $bridge bridge-id $bridge
}
@ -97,7 +97,7 @@ function _neutron_ovs_base_configure_l3_agent {
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
fi
neutron-ovs-cleanup
neutron-ovs-cleanup --config-file $NEUTRON_CONF
if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then
ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||
sudo ip link add $Q_PUBLIC_VETH_INT type veth \