openstack/devstack
Code Issues Proposed changes

Merge "Remove bad options calling quantum-ovs-cleanup"

Browse Source
This commit is contained in:
Jenkins
2013-02-08 17:40:57 +00:00
committed by Gerrit Code Review
parent 434bf036bf 88a3bc1d8d
commit f762cc9519
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/quantum_plugins/ovs_base
View File

@@ -12,7 +12,7 @@ function is_quantum_ovs_base_plugin() {
function _quantum_ovs_base_setup_bridge() { function _quantum_ovs_base_setup_bridge() {
local bridge=$1 local bridge=$1
quantum-ovs-cleanup --ovs_integration_bridge $bridge quantum-ovs-cleanup
sudo ovs-vsctl --no-wait -- --may-exist add-br $bridge sudo ovs-vsctl --no-wait -- --may-exist add-br $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
} }
@@ -39,7 +39,7 @@ function _quantum_ovs_base_configure_debug_command() {
function _quantum_ovs_base_configure_l3_agent() { function _quantum_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
quantum-ovs-cleanup --external_network_bridge $PUBLIC_BRIDGE quantum-ovs-cleanup
sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
# ensure no IP is configured on the public bridge # ensure no IP is configured on the public bridge
sudo ip addr flush dev $PUBLIC_BRIDGE sudo ip addr flush dev $PUBLIC_BRIDGE