commit 9cb8e57482c6751e1c1c3d752e006828a3d49a67
author Jenkins <jenkins@review.openstack.org> Thu Mar 28 23:25:54 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 28 23:25:54 2013 +0000
tree 5d89b597aacd89659f8212b1f259ca949e0ff99b
parent 7104ab406a30e20dbeffdbdcc5820cc508d8cab2
parent c0fad2b6a1729e7b1e7c6f892d6cac9d4a086433

Merge "Don't clobber all iSCSI connections during nova cleanup"

lib/nova

diff --git a/lib/nova b/lib/nova
index 4449f81..46eeea4 100644
--- a/lib/nova
+++ b/lib/nova
@@ -156,8 +156,11 @@
         fi
 
         # Logout and delete iscsi sessions
-        sudo iscsiadm --mode node | grep $VOLUME_NAME_PREFIX | cut -d " " -f2 | xargs sudo iscsiadm --mode node --logout || true
-        sudo iscsiadm --mode node | grep $VOLUME_NAME_PREFIX | cut -d " " -f2 | sudo iscsiadm --mode node --op delete || true
+        tgts=$(sudo iscsiadm --mode node | grep $VOLUME_NAME_PREFIX | cut -d ' ' -f2)
+        for target in $tgts; do
+            sudo iscsiadm --mode node -T $target --logout || true
+        done
+        sudo iscsiadm --mode node --op delete || true
 
         # Clean out the instances directory.
         sudo rm -rf $NOVA_INSTANCES_PATH/*