From 5d0c7394e0402f3889d17af192d67cb26eb3e540 Mon Sep 17 00:00:00 2001 From: Sam Betts Date: Fri, 10 Feb 2017 11:05:21 +0000 Subject: [PATCH] Ensure devstack does not try to delete a physical NIC Part of ironic-inspector devstack plugins cleanup proceedure is to try to delete the ironic-inspector network interface if it isn't the ovs bridge. This means that if you configure devstack to point at a real network interface it'll try to delete it and fail breaking devstack. Change-Id: I4f18edcf86278cce787a5f33f3d9f2444d738f2c --- devstack/plugin.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 15cbedaeb..ea3f71476 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -28,6 +28,7 @@ IRONIC_INSPECTOR_INTERNAL_IP=${IRONIC_INSPECTOR_INTERNAL_IP:-172.24.42.254} IRONIC_INSPECTOR_INTERNAL_SUBNET_SIZE=${IRONIC_INSPECTOR_INTERNAL_SUBNET_SIZE:-24} IRONIC_INSPECTOR_DHCP_RANGE=${IRONIC_INSPECTOR_DHCP_RANGE:-172.24.42.100,172.24.42.253} IRONIC_INSPECTOR_INTERFACE=${IRONIC_INSPECTOR_INTERFACE:-br-inspector} +IRONIC_INSPECTOR_INTERFACE_PHYSICAL=$(trueorfalse False IRONIC_INSPECTOR_INTERFACE_PHYSICAL) IRONIC_INSPECTOR_INTERNAL_URI="http://$IRONIC_INSPECTOR_INTERNAL_IP:$IRONIC_INSPECTOR_PORT" IRONIC_INSPECTOR_INTERNAL_IP_WITH_NET="$IRONIC_INSPECTOR_INTERNAL_IP/$IRONIC_INSPECTOR_INTERNAL_SUBNET_SIZE" # Whether DevStack will be setup for bare metal or VMs @@ -299,7 +300,7 @@ function cleanup_inspector { sudo iptables -F ironic-inspector | true sudo iptables -X ironic-inspector | true - if [[ $IRONIC_INSPECTOR_INTERFACE != $OVS_PHYSICAL_BRIDGE ]]; then + if [[ $IRONIC_INSPECTOR_INTERFACE != $OVS_PHYSICAL_BRIDGE && "$IRONIC_INSPECTOR_INTERFACE_PHYSICAL" == "False" ]]; 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