From 7b5c4e6797b8e7344f42728ef5cd2208cdc8717d Mon Sep 17 00:00:00 2001 From: "Haomeng, Wang" Date: Sun, 28 Dec 2014 03:15:14 +0000 Subject: [PATCH] ironic scripts should support $Q_USE_NAMESPACE add logic for ironic to support $Q_USE_NAMESPACE, if it is false, will not call 'ip netns' with network namespace Change-Id: Idc4dfb49ee478486476973a41b420b9b7e11a4e0 --- lib/ironic | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/ironic b/lib/ironic index 3f7ae2111c..8af3a7c3a6 100644 --- a/lib/ironic +++ b/lib/ironic @@ -455,7 +455,11 @@ function create_ovs_taps { # intentional sleep to make sure the tag has been set to port sleep 10 - local tapdev=$(sudo ip netns exec qdhcp-${ironic_net_id} ip link list | grep " tap" | cut -d':' -f2 | cut -b2-) + if [[ "$Q_USE_NAMESPACE" = "True" ]]; then + local tapdev=$(sudo ip netns exec qdhcp-${ironic_net_id} ip link list | grep " tap" | cut -d':' -f2 | cut -b2-) + else + local tapdev=$(sudo ip link list | grep " tap" | cut -d':' -f2 | cut -b2-) + fi local tag_id=$(sudo ovs-vsctl show |grep ${tapdev} -A1 -m1 | grep tag | cut -d':' -f2 | cut -b2-) # make sure veth pair is not existing, otherwise delete its links