Merge "Don't attempt to update tmpl ID when resource in progress"
This commit is contained in:
commit
5e89b8a1a6
|
@ -1384,6 +1384,8 @@ class Resource(status.ResourceStatus):
|
||||||
runner(timeout=timeout, progress_callback=progress_callback)
|
runner(timeout=timeout, progress_callback=progress_callback)
|
||||||
except UpdateReplace:
|
except UpdateReplace:
|
||||||
raise
|
raise
|
||||||
|
except exception.UpdateInProgress:
|
||||||
|
raise
|
||||||
except BaseException:
|
except BaseException:
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
update_templ_id_and_requires(persist=True)
|
update_templ_id_and_requires(persist=True)
|
||||||
|
|
Loading…
Reference in New Issue