Remove bad options calling quantum-ovs-cleanup
--external_network_bridge and --ovs_integration_bridge
are no longer a valid options
Fixes LP# 1115213
Change-Id: I9af4514a0cc661f4b72b3f0e00407be163c48945
diff --git a/lib/quantum_plugins/ovs_base b/lib/quantum_plugins/ovs_base
index d9f6fd0..f34e862 100644
--- a/lib/quantum_plugins/ovs_base
+++ b/lib/quantum_plugins/ovs_base
@@ -12,7 +12,7 @@
function _quantum_ovs_base_setup_bridge() {
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 br-set-external-id $bridge bridge-id $bridge
}
@@ -39,7 +39,7 @@
function _quantum_ovs_base_configure_l3_agent() {
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
# ensure no IP is configured on the public bridge
sudo ip addr flush dev $PUBLIC_BRIDGE