From 619228361608b176430a83db66bc350af24110b4 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 13 Dec 2019 08:59:26 -0500 Subject: [PATCH] deploy-steps: use lookup() to get pre|post_deployments_role variables Note: this patch is only for Stein and its previous versions. Train and master are fine. The syntax in place didn't allow to have an empty default for these 2 vars; which can happen in Queens if config-download is disabled. Using the lookup module allows to set a default. Change-Id: I38c658e0b0f2e334bd529fe66f937465036cc205 Closes-Bug: #1856314 (cherry picked from commit 44d2502383bc539287cf42ca488773242ad6be9f) --- common/deploy-steps.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 3ee99a19e4..dc7a23d6ed 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -433,7 +433,7 @@ outputs: - include_tasks: deployments.yaml vars: force: false - with_items: "{{ '{{' }} lookup('vars', 'pre_deployments_' + tripleo_role_name)|default([]) {{ '}}' }}" + with_items: "{{ '{{' }} lookup('vars', 'pre_deployments_' + tripleo_role_name, default=[]) {{ '}}' }}" tags: - overcloud - pre_deploy_steps @@ -521,7 +521,7 @@ outputs: - include_tasks: deployments.yaml vars: force: false - with_items: "{{ '{{' }} lookup('vars', 'post_deployments_' + tripleo_role_name)|default([]) {{ '}}' }}" + with_items: "{{ '{{' }} lookup('vars', 'post_deployments_' + tripleo_role_name, default=[]) {{ '}}' }}" tags: - overcloud - post_deploy_steps