Merge "Execute deploy_steps_tasks per step"

common/deploy-steps-tasks-step-0.j2.yaml

@@ -1,4 +1,6 @@
 - name: Deploy step tasks for step 0
+  delegate_to: localhost
+  run_once: true
   debug:
     msg: Use --start-at-task 'Deploy step tasks for step 0' to resume from this task
   when: "tripleo_minor_update is not defined or tripleo_minor_update != 'true'"
@@ -15,6 +17,15 @@
   copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755 setype=container_file_t
 
 {%- for role in roles %}
-- include_tasks: {{role.name}}/deploy_steps_tasks.yaml
+- name: Check for {{role.name}}/deploy_steps_tasks_step0.yaml
-  when: tripleo_role_name == '{{role.name}}'
+  delegate_to: localhost
+  run_once: true
+  become: false
+  stat:
+    path: "{{ '{{' }} playbook_dir ~ '/' ~ '{{role.name}}' ~ '/' ~ 'deploy_steps_tasks_step0.yaml' {{ '}}' }}"
+  register: tasks_stat
+- include_tasks: {{role.name}}/deploy_steps_tasks_step0.yaml
+  when:
+    - tripleo_role_name == '{{role.name}}'
+    - tasks_stat.stat.exists
 {%- endfor %}

common/deploy-steps.j2

@@ -782,8 +782,17 @@ outputs:
                   debug:
                     msg: Use --start-at-task 'Deploy step tasks for {{step}}' to resume from this task
 {%- for role in roles %}
-                - include_tasks: {{role.name}}/deploy_steps_tasks.yaml
+                - name: Check for {{role.name}}/deploy_steps_tasks_step{{step}}.yaml
-                  when: tripleo_role_name == '{{role.name}}'
+                  delegate_to: localhost
+                  become: false
+                  run_once: true
+                  stat:
+                    path: "{{ '{{' }} playbook_dir ~ '/' ~ '{{role.name}}' ~ '/' ~ 'deploy_steps_tasks_step{{step}}.yaml' {{ '}}' }}"
+                  register: tasks_stat
+                - include_tasks: {{role.name}}/deploy_steps_tasks_step{{step}}.yaml
+                  when:
+                    - tripleo_role_name == '{{role.name}}'
+                    - tasks_stat.stat.exists
 {%- endfor %}
               tags:
                 - overcloud