Merge "Get rid of jinja2 templating in conditional statements"
This commit is contained in:
commit
f888987f6f
|
@ -41,4 +41,4 @@
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/deploy_steps_tasks_step0.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/deploy_steps_tasks_step0.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
|
|
|
@ -461,9 +461,12 @@ outputs:
|
||||||
run_once: true
|
run_once: true
|
||||||
debug:
|
debug:
|
||||||
msg: Use --start-at-task 'External deployment step 0' to resume from this task
|
msg: Use --start-at-task 'External deployment step 0' to resume from this task
|
||||||
- include_tasks: "external_deploy_steps_tasks_step0.yaml"
|
{% raw %}
|
||||||
when:
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
- playbook_dir ~ '/external_deploy_steps_tasks_step0.yaml' is exists
|
vars:
|
||||||
|
_task_file_path: "external_deploy_steps_tasks_step0.yaml"
|
||||||
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
|
{% endraw %}
|
||||||
tags:
|
tags:
|
||||||
- external
|
- external
|
||||||
- external_deploy_steps
|
- external_deploy_steps
|
||||||
|
@ -694,7 +697,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/host_prep_tasks.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/host_prep_tasks.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
tags:
|
tags:
|
||||||
- overcloud
|
- overcloud
|
||||||
- host_prep_steps
|
- host_prep_steps
|
||||||
|
@ -764,7 +767,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/pre_deploy_step_tasks.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/pre_deploy_step_tasks.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
tags:
|
tags:
|
||||||
- overcloud
|
- overcloud
|
||||||
- pre_deploy_steps_tasks
|
- pre_deploy_steps_tasks
|
||||||
|
@ -797,9 +800,12 @@ outputs:
|
||||||
run_once: true
|
run_once: true
|
||||||
debug:
|
debug:
|
||||||
msg: Use --start-at-task 'External deployment step {{step}}' to resume from this task
|
msg: Use --start-at-task 'External deployment step {{step}}' to resume from this task
|
||||||
- include_tasks: "external_deploy_steps_tasks_step{{step}}.yaml"
|
{% raw %}
|
||||||
when:
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
- playbook_dir ~ '/external_deploy_steps_tasks_step{{step}}.yaml' is exists
|
vars:
|
||||||
|
_task_file_path: "external_deploy_steps_tasks_step{{step}}.yaml"
|
||||||
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
|
{% endraw %}
|
||||||
tags:
|
tags:
|
||||||
- external
|
- external
|
||||||
- external_deploy_steps
|
- external_deploy_steps
|
||||||
|
@ -854,7 +860,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/deploy_steps_tasks_step{{ step }}.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/deploy_steps_tasks_step{{ step }}.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
{% endraw %}
|
{% endraw %}
|
||||||
- name: Overcloud common deploy step tasks {{step}}
|
- name: Overcloud common deploy step tasks {{step}}
|
||||||
block:
|
block:
|
||||||
|
@ -986,7 +992,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/host_prep_tasks.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/host_prep_tasks.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
{% endraw %}
|
{% endraw %}
|
||||||
- import_tasks: deploy_steps_tasks_step_0.yaml
|
- import_tasks: deploy_steps_tasks_step_0.yaml
|
||||||
vars:
|
vars:
|
||||||
|
@ -1072,7 +1078,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/pre_upgrade_rolling_tasks.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/pre_upgrade_rolling_tasks.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
{% endraw %}
|
{% endraw %}
|
||||||
|
@ -1122,7 +1128,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/upgrade_tasks_step{{ step }}.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/upgrade_tasks_step{{ step }}.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
{% endraw %}
|
{% endraw %}
|
||||||
|
@ -1136,7 +1142,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/post_upgrade_tasks.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/post_upgrade_tasks.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
{% endraw %}
|
{% endraw %}
|
||||||
|
@ -1298,7 +1304,7 @@ outputs:
|
||||||
- include_tasks: "{{ _task_file_path }}"
|
- include_tasks: "{{ _task_file_path }}"
|
||||||
vars:
|
vars:
|
||||||
_task_file_path: "{{ tripleo_role_name }}/post_update_tasks.yaml"
|
_task_file_path: "{{ tripleo_role_name }}/post_update_tasks.yaml"
|
||||||
when: "'{{ playbook_dir }}/{{ _task_file_path }}' is exists"
|
when: playbook_dir ~ '/' ~ _task_file_path is exists
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
{% endraw %}
|
{% endraw %}
|
||||||
|
|
Loading…
Reference in New Issue