openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix playbook_dir Ansible Warning 

This change removes the jinja found within the conditionals used in our
deploy steps playbook which will resolve an Ansible warning seen when
running a deployment.

Change-Id: Ifa66a0805cba5c5a095731bda5e4f8c31626ed96
Signed-off-by: Kevin Carter <kecarter@redhat.com>
This commit is contained in:
Kevin Carter 2021-07-08 11:04:29 -05:00
parent 114e9c33b1
commit d98d6d1f5c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/deploy-steps.j2
View File

@ -476,7 +476,7 @@ outputs:
msg: Use --start-at-task 'External deployment step 0' to resume from this task
- include_tasks: "external_deploy_steps_tasks_step0.yaml"
when:
- "'{% raw %}{{playbook_dir}}{% endraw %}/external_deploy_steps_tasks_step0.yaml' is exists"
- playbook_dir ~ '/external_deploy_steps_tasks_step0.yaml' is exists
tags:
- external
- external_deploy_steps
@ -790,7 +790,7 @@ outputs:
include_tasks: {{role.name}}/pre_deploy_step_tasks.yaml
when:
- tripleo_role_name == '{{role.name}}'
- "'{% raw %}{{playbook_dir}}{% endraw %}/{{role.name}}/pre_deploy_step_tasks.yaml' is exists"
- playbook_dir ~ '/{{role.name}}/pre_deploy_step_tasks.yaml' is exists
{%- endfor %}
tags:
- overcloud
@ -825,7 +825,7 @@ outputs:
msg: Use --start-at-task 'External deployment step {{step}}' to resume from this task
- include_tasks: "external_deploy_steps_tasks_step{{step}}.yaml"
when:
- "'{% raw %}{{playbook_dir}}{% endraw %}/external_deploy_steps_tasks_step{{step}}.yaml' is exists"
- playbook_dir ~ '/external_deploy_steps_tasks_step{{step}}.yaml' is exists
tags:
- external
- external_deploy_steps
@ -885,7 +885,7 @@ outputs:
- include_tasks: "{{role.name}}/deploy_steps_tasks_step{{step}}.yaml"
when:
- tripleo_role_name == '{{role.name}}'
- "'{% raw %}{{playbook_dir}}{% endraw %}/{{role.name}}/deploy_steps_tasks_step{{step}}.yaml' is exists"
- playbook_dir ~ '/{{role.name}}/deploy_steps_tasks_step{{step}}.yaml' is exists
{%- endfor %}
- name: Overcloud common deploy step tasks {{step}}
block: