openstack/tripleo-heat-templates
Code Issues Proposed changes

Collapse host prep tasks

Browse Source 
Since plays cannot be parallelized with a free-like strategy, we should
have a single play that runs all host prep tasks rather than blocks of
plays for each defined role. By switching to this method we have a
single play that handles the host prep tasks concept that can be run all
at once across a cloud.

Change-Id: I2670840c9beac06f8b8ffc6eaecc88b9119ad298
This commit is contained in:
Alex Schultz 2020-06-09 12:24:03 -06:00 committed by Emilien Macchi
parent d58efb58e0
commit 3ef8f6008d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/deploy-steps.j2
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:
{%- for role in roles %}
- name: {{role.name}} Host prep block
when:
- tripleo_role_name == '{{role.name}}'
block:
- name: {{role.name}} Host prep steps - name: {{role.name}} Host prep steps
delegate_to: localhost delegate_to: localhost
run_once: true run_once: true
debug: debug:
msg: Use --start-at-task '{{role.name}} Host prep steps' to resume from this task msg: Use --start-at-task '{{role.name}} Host prep steps' to resume from this task
- import_tasks: {{role.name}}/host_prep_tasks.yaml - 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) %}