ProvisionOpenStack.destroy(): Don't pass --wait

... when deleting the instance

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index ea9e1705ee6a1203d01b94a72d8c87c93594b406..4cd9384f3b803e2ddc6812abf2786eb56aaa6443 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -230,7 +230,7 @@ class OpenStack(object):
         """
         try:
             server = json.loads(
-                misc.sh("openstack server show -f json %s" % id)
+                misc.sh("openstack server show -f json %s" % name_or_id)
             )
         except CalledProcessError:
             return False

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 2cb8d21e14250da9ab6f4932be558ec32c2ab183..f1621f6ed9d84577e287c4dfc1ccce7ad9f9d7cc 100644 (file)
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -361,7 +361,7 @@ class ProvisionOpenStack(OpenStack):
         for volume in volumes:
             misc.sh("openstack server remove volume %s %s" %
                     (name_or_id, volume))
-        misc.sh("openstack server delete --wait " + name_or_id)
+        misc.sh("openstack server delete " + name_or_id)
         for volume in volumes:
             misc.sh("openstack volume delete " + volume)
         return True