Merge "Collapse host prep tasks" into stable/ussuri
This commit is contained in:
commit
03bfe882c3
|
@ -644,10 +644,9 @@ outputs:
|
|||
- overcloud
|
||||
- pre_deploy_steps
|
||||
{% endraw %}
|
||||
{%- for role in roles %}
|
||||
|
||||
- hosts: {{role.name}}
|
||||
name: {{role.name}} Host prep steps
|
||||
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
|
||||
name: Host prep steps
|
||||
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
|
||||
any_errors_fatal: yes
|
||||
vars:
|
||||
|
@ -662,16 +661,21 @@ outputs:
|
|||
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
|
||||
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
|
||||
tasks:
|
||||
- name: {{role.name}} Host prep steps
|
||||
delegate_to: localhost
|
||||
run_once: true
|
||||
debug:
|
||||
msg: Use --start-at-task '{{role.name}} Host prep steps' to resume from this task
|
||||
- import_tasks: {{role.name}}/host_prep_tasks.yaml
|
||||
{%- for role in roles %}
|
||||
- name: {{role.name}} Host prep block
|
||||
when:
|
||||
- tripleo_role_name == '{{role.name}}'
|
||||
block:
|
||||
- name: {{role.name}} Host prep steps
|
||||
delegate_to: localhost
|
||||
run_once: true
|
||||
debug:
|
||||
msg: Use --start-at-task '{{role.name}} Host prep steps' to resume from this task
|
||||
- import_tasks: {{role.name}}/host_prep_tasks.yaml
|
||||
{%- endfor %}
|
||||
tags:
|
||||
- overcloud
|
||||
- host_prep_steps
|
||||
{%- endfor %}
|
||||
|
||||
{%- for step in range(1,deploy_steps_max) %}
|
||||
|
||||
|
|
Loading…
Reference in New Issue