commit e7559a479edec699f5b002daa1cf6518b39fb366
author Jenkins <jenkins@review.openstack.org> Tue Jul 30 01:14:44 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jul 30 01:14:44 2013 +0000
tree 4f0eccb8bee28cad8c00f718d0ecaa8f27af15ac
parent 278be6ebe1f787acbcd4854b222119be599e6431
parent 0d97cbe2b5066ee0f860b1fb94df3d7df6e2fcb2

Merge "xenapi: Uninstall instances"

tools/xen/install_os_domU.sh

diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index 2cba33c..e762f6d 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -151,9 +151,7 @@
     # Destroy any instances that were launched
     for uuid in `xe vm-list | grep -1 instance | grep uuid | sed "s/.*\: //g"`; do
         echo "Shutting down nova instance $uuid"
-        xe vm-unpause uuid=$uuid || true
-        xe vm-shutdown uuid=$uuid || true
-        xe vm-destroy uuid=$uuid
+        xe vm-uninstall uuid=$uuid force=true
     done
 
     # Destroy orphaned vdis