Still wait for hooks on failed resources

Previously, if a resource was in a FAILED state Heat would set the hook
but not wait for the user to clear it before continuing. It is not clear
what case this was designed to handle, since there's no way that I know
of for the resource to go into a FAILED state while waiting for the
hook.

Change-Id: Iaacc585b9806c08fd5a57c80c10eeb31cb0a8f71
Closes-Bug: #1665699
This commit is contained in:
Zane Bitter 2017-02-17 11:28:24 -05:00
parent 7e6ba07a6a
commit 5cd7ff3fa6
1 changed files with 1 additions and 1 deletions

View File

@ -485,7 +485,7 @@ class Resource(object):
% {'a': action, 'h': hook})
LOG.info(_LI('Reached hook on %s'), self)
while self.has_hook(hook) and self.status != self.FAILED:
while self.has_hook(hook):
try:
yield
except BaseException as exc: