openstack
/
heat
Code Issues Proposed changes

Merge "Don't attempt to update tmpl ID when resource in progress"

This commit is contained in:
Zuul 2017-10-23 15:10:44 +00:00 committed by Gerrit Code Review
parent ec40f1301d 79cc0cc7b9
commit 5e89b8a1a6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resource.py
View File

@ -1384,6 +1384,8 @@ class Resource(status.ResourceStatus):
runner(timeout=timeout, progress_callback=progress_callback)
except UpdateReplace:
raise
except exception.UpdateInProgress:
raise
except BaseException:
with excutils.save_and_reraise_exception():
update_templ_id_and_requires(persist=True)