Merge "Down PUBLIC_BRIDGE before trying to delete it"
This commit is contained in:
commit
289c600646
1
lib/neutron_plugins/linuxbridge_agent
Normal file → Executable file
1
lib/neutron_plugins/linuxbridge_agent
Normal file → Executable file
@ -8,6 +8,7 @@ _XTRACE_NEUTRON_LB=$(set +o | grep xtrace)
|
|||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
|
||||||
function neutron_lb_cleanup {
|
function neutron_lb_cleanup {
|
||||||
|
sudo ip link set $PUBLIC_BRIDGE down
|
||||||
sudo brctl delbr $PUBLIC_BRIDGE
|
sudo brctl delbr $PUBLIC_BRIDGE
|
||||||
|
|
||||||
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" = "vxlan" ]]; then
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" = "vxlan" ]]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user