Merge "[TRAIN ONLY] Check for correct file during --skip-deploy-identifier handling." into stable/train
This commit is contained in:
commit
1b63547e5d
|
@ -827,13 +827,13 @@ 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: 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:
|
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
|
register: container_startup_configs_json_stat
|
||||||
- include_tasks: common_deploy_steps_tasks_step_1.yaml
|
- include_tasks: common_deploy_steps_tasks_step_1.yaml
|
||||||
when:
|
when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or
|
||||||
- ((deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or not container_startup_configs_json_stat.stat.exists)
|
(container_startup_configs_json_stat is defined and not container_startup_configs_json_stat.stat.exists)
|
||||||
tags:
|
tags:
|
||||||
- overcloud
|
- overcloud
|
||||||
- deploy_steps
|
- deploy_steps
|
||||||
|
@ -862,9 +862,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-1.json already exists
|
- name: Check if /var/lib/tripleo-config/container-startup-config-step_{{ step }}.json already exists
|
||||||
stat:
|
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
|
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
|
||||||
|
|
Loading…
Reference in New Issue