From 1c7a60f5a894109fe2f942c418251e64626ebe93 Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Tue, 6 Dec 2016 13:48:31 -0500
Subject: [PATCH] Block the scale down workflow until the stack is COMPLETE or
 FAILED

Use the new workflow that loops until stack goes to IN_PROGRESS, then
loop until stack is COMPLETE or FAILED so a client doesn't need to
continually check.

Change-Id: I0a507bc2f20faf1ba1d76bc5f694548db3449b75
Closes-Bug: #1640770
---
 workbooks/scale.yaml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/workbooks/scale.yaml b/workbooks/scale.yaml
index ebd19054b..e5ae99876 100644
--- a/workbooks/scale.yaml
+++ b/workbooks/scale.yaml
@@ -18,14 +18,26 @@ workflows:
 
       delete_node:
         action: tripleo.scale.delete_node nodes=<% $.nodes %> timeout=<% $.timeout %> container=<% $.container %>
+        on-success: wait_for_stack_in_progress
+        on-error: set_delete_node_failed last_result=<% task(delete_node).result %>
+
+      wait_for_stack_in_progress:
+        workflow: tripleo.stack.v1.wait_for_stack_in_progress stack=<% $.container %>
+        on-success: wait_for_stack_complete
+        on-error: set_delete_node_failed last_result=<% task(wait_for_stack_in_progress).result %>
+
+      wait_for_stack_complete:
+        workflow: tripleo.stack.v1.wait_for_stack_complete_or_failed stack=<% $.container %>
         on-success: send_message
-        on-error: set_delete_node_failed
+        on-error: set_delete_node_failed last_result=<% task(wait_for_stack_complete).result %>
 
       set_delete_node_failed:
+        input:
+          last_result: 'Task failed'
         on-success: send_message
         publish:
           status: FAILED
-          message: <% task(delete_node).result %>
+          message: <% last_result %>
 
       send_message:
         action: zaqar.queue_post