openstack
/
heat
Code Issues Proposed changes

Fix restart_resource() 

Change-Id: Ia77c9a5ab4107d9803a6e8180fd9e34ac13436f5
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-06-05 11:22:07 +10:00
parent b0894d0e53
commit 8c30545f87
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/parser.py
View File

@ -252,12 +252,14 @@ class Stack(object):
''' '''
order = [] order = []
self.resource_append_deps(self.resources[resource_name], order) self.resource_append_deps(self.resources[resource_name], order)
failed = False
for r in reversed(order): for r in reversed(order):
res = self.resources[r] res = self.resources[r]
try: try:
res.delete() 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: except Exception as ex:
failed = True failed = True
res.state_set(res.DELETE_FAILED) res.state_set(res.DELETE_FAILED)
@ -285,7 +287,7 @@ class Stack(object):
def restart_resource(self, resource_name): def restart_resource(self, resource_name):
pool = eventlet.GreenPool() 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): def calulate_dependencies(self, s, r):
if isinstance(s, dict): if isinstance(s, dict):