|
...
|
...
|
@@ -12,7 +12,7 @@ function is_quantum_ovs_base_plugin() {
|
|
12
|
12
|
|
|
13
|
13
|
function _quantum_ovs_base_setup_bridge() {
|
|
14
|
14
|
local bridge=$1
|
|
15
|
|
- quantum-ovs-cleanup --ovs_integration_bridge $bridge
|
|
|
15
|
+ quantum-ovs-cleanup
|
|
16
|
16
|
sudo ovs-vsctl --no-wait -- --may-exist add-br $bridge
|
|
17
|
17
|
sudo ovs-vsctl --no-wait br-set-external-id $bridge bridge-id $bridge
|
|
18
|
18
|
}
|
|
...
|
...
|
@@ -39,7 +39,7 @@ function _quantum_ovs_base_configure_debug_command() {
|
|
39
|
39
|
function _quantum_ovs_base_configure_l3_agent() {
|
|
40
|
40
|
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
|
|
41
|
41
|
|
|
42
|
|
- quantum-ovs-cleanup --external_network_bridge $PUBLIC_BRIDGE
|
|
|
42
|
+ quantum-ovs-cleanup
|
|
43
|
43
|
sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
|
|
44
|
44
|
# ensure no IP is configured on the public bridge
|
|
45
|
45
|
sudo ip addr flush dev $PUBLIC_BRIDGE
|