From 89f9fd81584c96da19e0ef0cee227f6950f93bab Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 30 Jul 2013 10:56:52 +1200 Subject: [PATCH] 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 --- heat/engine/resources/rackspace/cloud_server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- 2.45.2