From f161bfb049b23b53706e6950f71aaaadf4687131 Mon Sep 17 00:00:00 2001 From: Luke Short Date: Fri, 22 May 2020 20:48:45 -0400 Subject: [PATCH] [Train-Only] Fix mixing nodes and limit_hosts. This corrects a behavior where in some cases the --limit is not passed to the ansible-playbook command during config_download_deploy. Change-Id: Ie5b8d41abacb071f528d4f9220bff3532ed0ab2f Closes-Bug: #1880977 Signed-off-by: Luke Short --- workbooks/deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workbooks/deployment.yaml b/workbooks/deployment.yaml index e37744177..85f7a1252 100644 --- a/workbooks/deployment.yaml +++ b/workbooks/deployment.yaml @@ -444,9 +444,9 @@ workflows: fields: ['instance_info'] with-items: node in <% $.nodes %> publish-on-error: - limit_hosts: <% $.nodes.join(',') %> + nodes_names: <% $.nodes.join(',') %> publish: - limit_hosts: <% list(task().result.instance_info.display_name).join(',') %> + nodes_names: <% list(task().result.instance_info.display_name).join(',') %> get_private_key: action: tripleo.validations.get_privkey @@ -525,7 +525,7 @@ workflows: timeout: <% $.connection_timeout %> command_timeout: <% $.config_download_timeout %> execution_id: <% execution().id %> - limit_hosts: <% $.nodes and $.get(limit_hosts) or false %> + limit_hosts: <% ($.nodes_names or $.limit_hosts) or false %> skip_tags: <% $.skip_tags %> tags: <% $.tags %> publish: