Merge "Don't remove resources from the DB during HA restart"

heat/engine/parser.py

@@ -249,7 +249,7 @@ class Stack(object):
         failures = []
 
         for res in reversed(self):
-            result = res.delete()
+            result = res.destroy()
             if result:
                 failures.append(str(res))
 

heat/engine/resources.py

@@ -193,7 +193,17 @@ class Resource(object):
             logger.exception('Delete %s', str(self))
             self.state_set(self.DELETE_FAILED, str(ex))
             return str(ex)
-        else:
+
+        self.state_set(self.DELETE_COMPLETE)
+
+    def destroy(self):
+        '''
+        Delete the resource and remove it from the database.
+        '''
+        result = self.delete()
+        if result:
+            return result
+
         try:
             db_api.resource_get(self.stack.context, self.id).delete()
         except exception.NotFound:
@@ -201,12 +211,9 @@ class Resource(object):
             # not been created yet.
             pass
         except Exception as ex:
-                self.state_set(self.DELETE_FAILED)
             logger.exception('Delete %s from DB' % str(self))
             return str(ex)
 
-            self.state_set(self.DELETE_COMPLETE)
-
     def instance_id_set(self, inst):
         self.instance_id = inst