Merge "Collapse host prep tasks"

This commit is contained in:
Zuul 2020-06-24 10:43:18 +00:00 committed by Gerrit Code Review
commit 77ef66c770
1 changed files with 14 additions and 10 deletions

View File

@ -652,10 +652,9 @@ outputs:
- overcloud - overcloud
- pre_deploy_steps - pre_deploy_steps
{% endraw %} {% endraw %}
{%- for role in roles %}
- hosts: {{role.name}} - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
name: {{role.name}} Host prep steps name: Host prep steps
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}" gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
any_errors_fatal: yes any_errors_fatal: yes
vars: vars:
@ -670,16 +669,21 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks: tasks:
- name: {{role.name}} Host prep steps {%- for role in roles %}
delegate_to: localhost - name: {{role.name}} Host prep block
run_once: true when:
debug: - tripleo_role_name == '{{role.name}}'
msg: Use --start-at-task '{{role.name}} Host prep steps' to resume from this task block:
- import_tasks: {{role.name}}/host_prep_tasks.yaml - 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: tags:
- overcloud - overcloud
- host_prep_steps - host_prep_steps
{%- endfor %}
{%- for step in range(1,deploy_steps_max) %} {%- for step in range(1,deploy_steps_max) %}