From: Steve Baker <sbaker@redhat.com>
Date: Mon, 29 Jul 2013 22:56:52 +0000 (+1200)
Subject: Stop delete polling after status == DELETED.
X-Git-Tag: 2014.1~292
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=89f9fd81584c96da19e0ef0cee227f6950f93bab;p=openstack-build%2Fheat-build.git

Stop delete polling after status == DELETED.

A rackspace server can be in status DELETED for some minutes
until a 404 is raised. This change speeds the deletion of a stack
by considering the resource deleted as soon as the status changes
to DELETED.

Change-Id: Id81d3099ef6b41b374973074b065b20c2acc9667
---

diff --git a/heat/engine/resources/rackspace/cloud_server.py b/heat/engine/resources/rackspace/cloud_server.py
index f4c974ad..93b6a407 100644
--- a/heat/engine/resources/rackspace/cloud_server.py
+++ b/heat/engine/resources/rackspace/cloud_server.py
@@ -399,7 +399,9 @@ zypper --non-interactive in cloud-init python-boto python-pip gcc python-devel
             yield
             try:
                 server.get()
-                if server.status == "ERROR":
+                if server.status == "DELETED":
+                    break
+                elif server.status == "ERROR":
                     exc = exception.Error("Deletion of server %s failed." %
                                           server.name)
                     raise exception.ResourceFailure(exc)