Browse code

Merge "Ironic: Fix tag ID detection of tap devices"

Jenkins authored on 2015/09/22 22:09:41
Showing 1 changed files
... ...
@@ -509,9 +509,9 @@ function create_ovs_taps {
509 509
     sleep 10
510 510
 
511 511
     if  [[ "$Q_USE_NAMESPACE" = "True" ]]; then
512
-        local tapdev=$(sudo ip netns exec qdhcp-${ironic_net_id} ip link list | grep " tap" | cut -d':' -f2 | cut -b2-)
512
+        local tapdev=$(sudo ip netns exec qdhcp-${ironic_net_id} ip link list | grep " tap" | cut -d':' -f2 | cut -d'@' -f1 | cut -b2-)
513 513
     else
514
-        local tapdev=$(sudo ip link list | grep " tap" | cut -d':' -f2 | cut -b2-)
514
+        local tapdev=$(sudo ip link list | grep " tap" | cut -d':' -f2 | cut -d'@' -f1 | cut -b2-)
515 515
     fi
516 516
     local tag_id=$(sudo ovs-vsctl show |grep ${tapdev} -A1 -m1 | grep tag | cut -d':' -f2 | cut -b2-)
517 517