From 5cd7ff3fa66779bb7db9bf36e55e95863bbfa0e9 Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 17 Feb 2017 11:28:24 -0500
Subject: [PATCH] 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
---
 heat/engine/resource.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 7dbb42ff5a..85c2b25cca 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -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: