openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[TRAIN ONLY] Check for correct file during --skip-deploy-identifier handling." into stable/train

This commit is contained in:
Zuul 2020-01-28 19:24:50 +00:00 committed by Gerrit Code Review
parent fa8c5ceffe b1ac5e1e2b
commit 1b63547e5d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/deploy-steps.j2
View File

@ -827,13 +827,13 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks:
- name: Check if /var/lib/tripleo-config/container-startup-config-1.json already exists
- name: Check if /var/lib/tripleo-config/container-startup-config-step_1.json already exists
stat:
path: /var/lib/tripleo-config/container-startup-config-1.json
path: /var/lib/tripleo-config/container-startup-config-step_1.json
register: container_startup_configs_json_stat
- include_tasks: common_deploy_steps_tasks_step_1.yaml
when:
- ((deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or not container_startup_configs_json_stat.stat.exists)
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:
- overcloud
- deploy_steps
@ -862,9 +862,9 @@ outputs:
run_once: true
debug:
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-1.json already exists
- name: Check if /var/lib/tripleo-config/container-startup-config-step_{{ step }}.json already exists
stat:
path: /var/lib/tripleo-config/container-startup-config-1.json
path: /var/lib/tripleo-config/container-startup-config-step_{{ step }}.json
register: container_startup_configs_json_stat
- include_tasks: common_deploy_steps_tasks.yaml
when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or