Merge "Check for stack failure earlier in undercloud deploy"

tripleoclient/v1/undercloud_deploy.py

@@ -38,6 +38,7 @@
     from urllib.request import urlopen
 
 from cliff import command
+from heatclient.common import event_utils
 from heatclient.common import template_utils
 from openstackclient.i18n import _
 
@@ -199,6 +200,12 @@ def _heat_deploy(self, stack_name, template_path, parameters,
             time.sleep(1)
             server_stack_id = self._lookup_tripleo_server_stackid(
                 orchestration_client, stack_id)
+            status = orchestration_client.stacks.get(stack_id).status
+            if status == 'FAILED':
+                event_utils.poll_for_events(orchestration_client, stack_name)
+                msg = ('Stack failed before deployed-server resource '
+                       'created.')
+                raise Exception(msg)
             if server_stack_id:
                 break
         if not server_stack_id: