From: Angus Salkeld <asalkeld@redhat.com>
Date: Tue, 5 Jun 2012 01:22:07 +0000 (+1000)
Subject: Fix restart_resource()
X-Git-Tag: 2014.1~1753
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8c30545f871d92f97780a6389b5b06148c59f441;p=openstack-build%2Fheat-build.git

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 fcb38d42..6d6ec4d5 100644
--- 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):