From 0bc1b24b4f423a5af305dfd6641d5a60b0d93df7 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 24 Jun 2013 14:30:23 +1200 Subject: [PATCH] Allow a resource delete to be re-attempted. If a resource is in a DELETE IN_PROGRESS state, and the resource is deleted again, another attempt will be made to delete the resource. Fixes bug: #1193975 Change-Id: I615612b4e5f21f2a2cb168f47c33a8f9db7e9e81 --- heat/engine/resource.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/heat/engine/resource.py b/heat/engine/resource.py index a77c20ea..d2e99c9e 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -463,8 +463,6 @@ class Resource(object): ''' if (self.action, self.status) == (self.DELETE, self.COMPLETE): return - if (self.action, self.status) == (self.DELETE, self.IN_PROGRESS): - raise exception.Error('Resource deletion already in progress') # No need to delete if the resource has never been created if self.action is None: return -- 2.45.2