Wait for deletion of Instances during creation

When an Instance was still in the BUILD state when it was deleted, the
resource was not waiting for the instance to be deleted before declaring
success and moving on.

Change-Id: I05d553fedf10e01a06e20ca0e8ccbbbf463980e4
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index b2477080892ec204976b34a1ad143934e43520ce..bc2c35fbc86072e371400eb7009173ba8f3ba4d2 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -318,7 +318,7 @@ class Instance(resource.Resource):
             pass
         else:
             server.delete()
-            while server.status == 'ACTIVE':
+            while True:
                 try:
                     server.get()
                 except clients.novaclient.exceptions.NotFound: