From 718a7b176f5b903619723432c92d140e9c2844ac Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Tue, 30 Jan 2018 12:45:22 -0330
Subject: [PATCH] Handle failed nodes when enabling ssh admin

Filter server list by state before selecting by control plane address to
avoid YAQL expression issues.

Closes-Bug: #1749450
Change-Id: I0ae383105bc5d8849a733bfbe5bd61fb3fc24c66
(cherry picked from commit 3933a66c88293efc016444f04fa92b3c7c3b863a)
---
 workbooks/access.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/workbooks/access.yaml b/workbooks/access.yaml
index 4fcad7299..2afa0d511 100644
--- a/workbooks/access.yaml
+++ b/workbooks/access.yaml
@@ -121,14 +121,18 @@ workflows:
     tasks:
       get_servers:
         action: nova.servers_list
-        on-success: create_admin
+        with-items: server in <% $.ssh_servers %>
+        input:
+          search_opts:
+            ip: <% $.server %>
         publish:
-          servers: <% let(root => $) -> task().result._info.where($.addresses.ctlplane.addr.any($ in $root.ssh_servers)) %>
+          servers: <% task().result._info %>
+        on-success: create_admin
 
       create_admin:
         workflow: tripleo.deployment.v1.deploy_on_server
         on-success: get_privkey
-        with-items: server in <% $.servers %>
+        with-items: server in <% $.servers.flatten() %>
         input:
           server_name: <% $.server.name %>
           server_uuid: <% $.server.id %>