From c4cbfa7723c8424a339eff7be07dc3116aca0720 Mon Sep 17 00:00:00 2001 From: Noam Angel Date: Sun, 22 Jan 2017 08:34:21 +0200 Subject: [PATCH] [devstack] Remove bridge only if it's not OVB_PHYSICAL_BRIDGE In a scenario we want to deploy DevStack with ironic inspector for real hardware and use OVS_PHYSICAL_BRIDGE for IRONIC_INSPECTOR_INTERFACE as well we dont need to issue interface delete. Change-Id: I45271ddc34b5e9d542b6a1499d698503717f5f03 --- devstack/plugin.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f96ebeb6a..430cc4011 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -296,7 +296,9 @@ function cleanup_inspector { sudo iptables -F ironic-inspector | true sudo iptables -X ironic-inspector | true - sudo ip link show $IRONIC_INSPECTOR_INTERFACE && sudo ip link delete $IRONIC_INSPECTOR_INTERFACE + if [[ $IRONIC_INSPECTOR_INTERFACE != $OVS_PHYSICAL_BRIDGE ]]; then + sudo ip link show $IRONIC_INSPECTOR_INTERFACE && sudo ip link delete $IRONIC_INSPECTOR_INTERFACE + fi sudo ip link show brbm-inspector && sudo ip link delete brbm-inspector sudo ovs-vsctl --if-exists del-port brbm-inspector }