openstack
/
heat
Code Issues Proposed changes

Merge "Don't delete RawTemplate if it referenced by a stack"

This commit is contained in:
Jenkins 2016-11-15 05:26:19 +00:00 committed by Gerrit Code Review
parent ddd55567f5 55c21c18e6
commit 0132072106
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/engine/resources/stack_resource.py
View File

@ -284,14 +284,14 @@ class StackResource(resource.Resource):
'parent_resource_name': self.name
})
with self.translate_remote_exceptions:
result = None
try:
result = self.rpc_client()._create_stack(self.context,
**kwargs)
finally:
if adopt_data is None and not result:
raw_template.RawTemplate.delete(self.context,
kwargs['template_id'])
except exception.HeatException:
with excutils.save_and_reraise_exception():
if adopt_data is None:
raw_template.RawTemplate.delete(self.context,
kwargs['template_id'])
self.resource_id_set(result['stack_id'])
@ -485,12 +485,10 @@ class StackResource(resource.Resource):
'args': {rpc_api.PARAM_TIMEOUT: timeout_mins}
})
with self.translate_remote_exceptions:
result = None
try:
result = self.rpc_client()._update_stack(self.context,
**kwargs)
finally:
if not result:
self.rpc_client()._update_stack(self.context, **kwargs)
except exception.HeatException:
with excutils.save_and_reraise_exception():
raw_template.RawTemplate.delete(self.context,
kwargs['template_id'])
return cookie