openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Collapse deploy steps" into stable/ussuri

This commit is contained in:
Zuul 2020-07-14 07:07:37 +00:00 committed by Gerrit Code Review
parent 8ce4477b3a ccb1391783
commit 2041392ae3
1 changed files with 28 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
common/deploy-steps.j2
View File

@ -745,77 +745,38 @@ outputs:
- tripleo_role_name == '{{role.name}}' - tripleo_role_name == '{{role.name}}'
- "{% raw %}'{{ playbook_dir }}/{{ _task_file_path }}' is exists{% endraw %}" - "{% raw %}'{{ playbook_dir }}/{{ _task_file_path }}' is exists{% endraw %}"
{%- endfor %} {%- endfor %}
tags:
- overcloud
- deploy_steps
- step{{step}}
{% if step == 1 %} {% if step == 1 %}
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
name: Overcloud common bootstrap tasks for step 1
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
any_errors_fatal: yes
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks:
- name: Overcloud common bootstrap tasks for step 1 - name: Overcloud common bootstrap tasks for step 1
delegate_to: localhost block:
run_once: true - name: Overcloud common bootstrap tasks for step 1
debug: delegate_to: localhost
msg: Use --start-at-task 'Overcloud common bootstrap tasks for step 1' to resume from this task run_once: true
- name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists" debug:
stat: msg: Use --start-at-task 'Overcloud common bootstrap tasks for step 1' to resume from this task
path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}" - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
register: container_startup_configs_json_stat stat:
- name: Write config data at the start of step 1 path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}"
include_tasks: common_deploy_steps_tasks_step_1.yaml register: container_startup_configs_json_stat
when: - name: Write config data at the start of step 1
- ((deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or not container_startup_configs_json_stat.stat.exists) include_tasks: common_deploy_steps_tasks_step_1.yaml
tags: when:
- overcloud - ((deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or
- deploy_steps not container_startup_configs_json_stat.stat.exists)
- step{{step}}
{% endif %} {% endif %}
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
name: Overcloud common deploy step tasks {{step}}
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
any_errors_fatal: yes
vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID
step: '{{step}}'
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
docker_puppet_debug: DOCKER_PUPPET_DEBUG
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks:
- name: Overcloud common deploy step tasks {{step}} - name: Overcloud common deploy step tasks {{step}}
delegate_to: localhost block:
run_once: true - name: Overcloud common deploy step tasks {{step}}
debug: delegate_to: localhost
msg: Use --start-at-task 'Overcloud common deploy step tasks {{step}}' to resume from this task run_once: true
- name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists" debug:
stat: msg: Use --start-at-task 'Overcloud common deploy step tasks {{step}}' to resume from this task
path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}" - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
register: container_startup_configs_json_stat stat:
- include_tasks: common_deploy_steps_tasks.yaml path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}"
when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or register: container_startup_configs_json_stat
(container_startup_configs_json_stat is defined and not container_startup_configs_json_stat.stat.exists) - include_tasks: common_deploy_steps_tasks.yaml
when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or
(container_startup_configs_json_stat is defined and not container_startup_configs_json_stat.stat.exists)
tags: tags:
- overcloud - overcloud
- deploy_steps - deploy_steps