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

common/deploy-steps.j2

@@ -683,9 +683,9 @@ outputs:
                       run_once: true
                       debug:
                         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:
-                        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
                     - name: Write config data at the start of step 1
                       include_tasks: common_deploy_steps_tasks_step_1.yaml
@@ -700,9 +700,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-step_{{step}}.json already exists"
+                    - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
                       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
                     - include_tasks: common_deploy_steps_tasks.yaml
                       when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or