From db2402b6ffb1bffbdbd574c35b1eb2a0934c566c Mon Sep 17 00:00:00 2001 From: Noam Angel Date: Sun, 22 Jan 2017 08:27:39 +0200 Subject: [PATCH] Skip brbm-inspector veth if IRONIC_IS_HARDWARE == True In a scenario when using DevStack and ironic-inspector for real hardware we dont need to following lines to run in "prepare_environment" function. Change-Id: I1c1d09364db87f922b047c7fb1c50c047f1377fb --- devstack/plugin.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f96ebeb6a..361b02170 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -30,7 +30,8 @@ IRONIC_INSPECTOR_DHCP_RANGE=${IRONIC_INSPECTOR_DHCP_RANGE:-172.24.42.100,172.24. IRONIC_INSPECTOR_INTERFACE=${IRONIC_INSPECTOR_INTERFACE:-br-inspector} 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 +IRONIC_IS_HARDWARE=$(trueorfalse False IRONIC_IS_HARDWARE) IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK=${IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK:-""} GITDIR["python-ironic-inspector-client"]=$DEST/python-ironic-inspector-client @@ -254,10 +255,12 @@ function prepare_environment { prepare_tftp create_ironic_inspector_cache_dir - sudo ip link add brbm-inspector type veth peer name $IRONIC_INSPECTOR_INTERFACE - sudo ip link set dev brbm-inspector up + if [[ "$IRONIC_IS_HARDWARE" == "False" ]]; then + sudo ip link add brbm-inspector type veth peer name $IRONIC_INSPECTOR_INTERFACE + sudo ip link set dev brbm-inspector up + sudo ovs-vsctl add-port brbm brbm-inspector + fi sudo ip link set dev $IRONIC_INSPECTOR_INTERFACE up - sudo ovs-vsctl add-port brbm brbm-inspector sudo ip addr add $IRONIC_INSPECTOR_INTERNAL_IP_WITH_NET dev $IRONIC_INSPECTOR_INTERFACE sudo iptables -I INPUT -i $IRONIC_INSPECTOR_INTERFACE -p udp \