From 7859e7999c56a2d8cf9d2f0a7ef696c71477672a Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 22 Jul 2020 15:47:01 -0600 Subject: [PATCH] Stop using a conditional for role tasks Currently this task definition is causing the following warning to be thrown at execution time: [WARNING]: conditional statements should not include jinja2 templating delimiters such as {{ }} or {% %}. Found: '{{ playbook_dir }}/{{ _task_file_path }}' is exists There is no reason to be using this conditional with a variable since this file path is known when we create the playbook. Additionally we don't need to use the playbook_dir because we're not using it in the include_tasks. This allows us to specifically express the file that we're using for these tasks inclusions rather than relying on a conditional that is not recommended. Change-Id: I368e99d2384469ca166e2e2b00e8621b7afe72db (cherry picked from commit ea62bcf150885ca91aeb37f098d60bf51cd5a7b7) --- common/deploy-steps.j2 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 41ccdc19b2..29bd72fb16 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -740,12 +740,10 @@ outputs: debug: msg: Use --start-at-task "Overcloud deploy step tasks for {{step}}" to resume from this task {%- for role in roles %} - - include_tasks: "{% raw %}{{ _task_file_path }}{% endraw %}" - vars: - _task_file_path: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml" + - include_tasks: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml" when: - tripleo_role_name == '{{role.name}}' - - "{% raw %}'{{ playbook_dir }}/{{ _task_file_path }}' is exists{% endraw %}" + - "'{{role.name}}/deploy_steps_tasks_step{{step}}.yaml' is exists" {%- endfor %} {% if step == 1 %} - name: Overcloud common bootstrap tasks for step 1