openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[stable/train] Check correct location for skip-deploy-identifier" into stable/train

This commit is contained in:
Zuul 2020-11-24 00:25:22 +00:00 committed by Gerrit Code Review
parent f296b67e66 0b39f391ed
commit a405703e32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/deploy-steps.j2
View File

@ -683,9 +683,9 @@ outputs:
run_once: true run_once: true
debug: debug:
msg: Use --start-at-task 'Overcloud common bootstrap tasks for step 1' to resume from this task msg: Use --start-at-task 'Overcloud common bootstrap tasks for step 1' to resume from this task
- name: "Check if /var/lib/tripleo-config/container-startup-config-step_1.json already exists" - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
stat: stat:
path: "/var/lib/tripleo-config/container-startup-config-step_1.json" path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}"
register: container_startup_configs_json_stat register: container_startup_configs_json_stat
- name: Write config data at the start of step 1 - name: Write config data at the start of step 1
include_tasks: common_deploy_steps_tasks_step_1.yaml include_tasks: common_deploy_steps_tasks_step_1.yaml
@ -700,9 +700,9 @@ outputs:
run_once: true run_once: true
debug: debug:
msg: Use --start-at-task 'Overcloud common deploy step tasks {{step}}' to resume from this task msg: Use --start-at-task 'Overcloud common deploy step tasks {{step}}' to resume from this task
- name: "Check if /var/lib/tripleo-config/container-startup-config-step_{{step}}.json already exists" - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
stat: stat:
path: "/var/lib/tripleo-config/container-startup-config-step_{{step}}.json" path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}"
register: container_startup_configs_json_stat register: container_startup_configs_json_stat
- include_tasks: common_deploy_steps_tasks.yaml - include_tasks: common_deploy_steps_tasks.yaml
when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or