From 10d939a1c6fe885f3400539cb8d3d2713e05b766 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Mon, 8 Apr 2013 12:43:35 +0200 Subject: [PATCH] Attempt to delete resources even if they failed To do otherwise risks leaving resources silently running that exist but have experienced some kind of error during creation. Fixes bug 1165023 Change-Id: Ie60fb053b1a596d102ca1b6a8429dd50ed41ff92 --- heat/engine/resource.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/heat/engine/resource.py b/heat/engine/resource.py index bcfef8d2..ccd5d133 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -396,11 +396,7 @@ class Resource(object): return if self.state == self.DELETE_IN_PROGRESS: return 'Resource deletion already in progress' - if self.state == self.CREATE_FAILED: - return - # Further resources will not be created in a CREATE_FAILED stack. - # The state of these resources is None. Do not delete as an - # undeleteable stack will result + # No need to delete if the resource has never been created if self.state is None: return -- 2.45.2