openstack/devstack
Code Issues Proposed changes

Merge "Provide configuration file to ovs-cleanup utility"

Browse Source
This commit is contained in:
Jenkins 2016-11-30 21:31:43 +00:00 committed by Gerrit Code Review
commit df51567525
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 { function _neutron_ovs_base_setup_bridge {
local bridge=$1 local bridge=$1
neutron-ovs-cleanup neutron-ovs-cleanup --config-file $NEUTRON_CONF
_neutron_ovs_base_add_bridge $bridge _neutron_ovs_base_add_bridge $bridge
sudo ovs-vsctl --no-wait br-set-external-id $bridge bridge-id $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 iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
fi fi
neutron-ovs-cleanup neutron-ovs-cleanup --config-file $NEUTRON_CONF
if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then if [[ "$Q_USE_PUBLIC_VETH" = "True" ]]; then
ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 || ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||
sudo ip link add $Q_PUBLIC_VETH_INT type veth \ sudo ip link add $Q_PUBLIC_VETH_INT type veth \