Merge "Update, avoid task skipping by directly importing step file."
This commit is contained in:
commit
24bf5c449f
|
@ -852,13 +852,6 @@ outputs:
|
||||||
|
|
||||||
external_deploy_steps_tasks: {get_attr: [ExternalDeployTasks, value]}
|
external_deploy_steps_tasks: {get_attr: [ExternalDeployTasks, value]}
|
||||||
external_post_deploy_steps_tasks: {get_attr: [ExternalPostDeployTasks, value]}
|
external_post_deploy_steps_tasks: {get_attr: [ExternalPostDeployTasks, value]}
|
||||||
update_steps_tasks: |
|
|
||||||
{%- for role in roles %}
|
|
||||||
- include_tasks: {{role.name}}/update_tasks.yaml
|
|
||||||
when: tripleo_role_name == '{{role.name}}'
|
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
{%- endfor %}
|
|
||||||
update_steps_playbook:
|
update_steps_playbook:
|
||||||
{{ self.deploy_steps_str_replace_params() }}
|
{{ self.deploy_steps_str_replace_params() }}
|
||||||
template: |
|
template: |
|
||||||
|
@ -886,33 +879,28 @@ outputs:
|
||||||
tripleo_minor_update: true
|
tripleo_minor_update: true
|
||||||
tasks:
|
tasks:
|
||||||
- import_tasks: hiera_steps_tasks.yaml
|
- import_tasks: hiera_steps_tasks.yaml
|
||||||
- include_tasks: update_steps_tasks.yaml
|
{%- for step in range(0,update_steps_max) %}
|
||||||
with_sequence: start=0 end={{update_steps_max-1}}
|
- import_tasks: "{{ role.name }}/update_tasks_step{{ step }}.yaml"
|
||||||
loop_control:
|
vars:
|
||||||
loop_var: step
|
step: "{{ step }}"
|
||||||
tags:
|
{%- endfor %}
|
||||||
- always
|
- import_tasks: "{{role.name}}/host_prep_tasks.yaml"
|
||||||
- include_tasks: {{role.name}}/host_prep_tasks.yaml
|
|
||||||
when: tripleo_role_name == '{{role.name}}'
|
when: tripleo_role_name == '{{role.name}}'
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
- import_tasks: deploy_steps_tasks_step_0.yaml
|
- import_tasks: deploy_steps_tasks_step_0.yaml
|
||||||
vars:
|
vars:
|
||||||
step: 0
|
step: 0
|
||||||
- name: Write config data at the start of step 1
|
- name: Write config data at the start of step 1
|
||||||
import_tasks: common_deploy_steps_tasks_step_1.yaml
|
import_tasks: common_deploy_steps_tasks_step_1.yaml
|
||||||
- include_tasks: common_deploy_steps_tasks.yaml
|
{%- for step in range(1,deploy_steps_max) %}
|
||||||
with_sequence: start=1 end={{deploy_steps_max-1}}
|
- import_tasks: common_deploy_steps_tasks.yaml
|
||||||
loop_control:
|
vars:
|
||||||
loop_var: step
|
step: "{{ step }}"
|
||||||
tags:
|
{%- endfor %}
|
||||||
- always
|
{%- for step in range(0,post_update_steps_max) %}
|
||||||
- include_tasks: post_update_steps_tasks.yaml
|
- import_tasks: "{{ role.name }}/post_update_tasks_step{{ step }}.yaml"
|
||||||
with_sequence: start=0 end={{post_update_steps_max-1}}
|
vars:
|
||||||
loop_control:
|
step: "{{ step }}"
|
||||||
loop_var: step
|
{%- endfor %}
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
external_update_steps_tasks: {get_attr: [ExternalUpdateTasks, value]}
|
external_update_steps_tasks: {get_attr: [ExternalUpdateTasks, value]}
|
||||||
external_update_steps_playbook:
|
external_update_steps_playbook:
|
||||||
|
|
Loading…
Reference in New Issue