Fix restart_resource()

Change-Id: Ia77c9a5ab4107d9803a6e8180fd9e34ac13436f5
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index fcb38d42a92dc420ab446d9d00bde676f5fe7fa2..6d6ec4d5a9345704c0cde7e5907b5a8a2535df47 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -252,12 +252,14 @@ class Stack(object):
         '''
         order = []
         self.resource_append_deps(self.resources[resource_name], order)
+        failed = False
 
         for r in reversed(order):
             res = self.resources[r]
             try:
                 res.delete()
-                #db_api.resource_get(context, self.resources[r].id).delete()
+                re = db_api.resource_get(self.context, self.resources[r].id)
+                re.delete()
             except Exception as ex:
                 failed = True
                 res.state_set(res.DELETE_FAILED)
@@ -285,7 +287,7 @@ class Stack(object):
 
     def restart_resource(self, resource_name):
         pool = eventlet.GreenPool()
-        pool.spawn_n(self.restart_resource_blocking)
+        pool.spawn_n(self.restart_resource_blocking, resource_name)
 
     def calulate_dependencies(self, s, r):
         if isinstance(s, dict):