Dynamically include generate-config tasks

The generate-config tasks which run on the host to generate config data
under /var/lib/config-data, only run at step1.

There are several tasks that used a when statement to only run the
related tasks at step1. This patch moves all the related generate-config
tasks to a separate tasks file, which can then be dynamically included
at step1.

Using a dynamic include results in less tasks being skipped, which can
save several minutes at scale. This results in 4 less tasks that need to
be skipped at steps 2-5, which equates to 16 tasks overall.

Change-Id: Ifdddcb13362e26babedd47e674089fb0e2a37994
(cherry picked from commit c8bc412e4f)

common/deploy-steps-tasks.yaml

@@ -139,71 +139,9 @@
     # Generate config via container-puppet.py
     ######################################
 
-    - name: Run container-puppet tasks (generate config) during step {{ step }}
-      async: 3600
-      poll: 0
-      shell: "{{ python_cmd }} /var/lib/container-puppet/container-puppet.py"
-      environment:
-        NET_HOST: 'true'
-        DEBUG: '{{ docker_puppet_debug | bool }}'
-        PROCESS_COUNT: '{{ docker_puppet_process_count }}'
-        CONTAINER_CLI: "{{ container_cli }}"
-        CONFIG: '/var/lib/container-puppet/{{ ansible_check_mode | bool | ternary("check-mode/", "") }}container-puppet.json'
-        CONFIG_VOLUME_PREFIX: '/var/lib/config-data{{ ansible_check_mode | bool | ternary("/check-mode", "") }}'
-        CHECK_MODE: '{{ ansible_check_mode | bool | ternary(1, 0) }}'
-        STARTUP_CONFIG_PATTERN: '/var/lib/tripleo-config/container-startup-config/*/{{ ansible_check_mode | bool | ternary("check-mode/", "") }}*.json'
-        MOUNT_HOST_PUPPET: '{{docker_puppet_mount_host_puppet | default(true)}}'
-        CONTAINER_LOG_STDOUT_PATH: "{{ container_log_stdout_path }}"
-        CONTAINER_HEALTHCHECK_DISABLED: "{{ container_healthcheck_disabled }}"
+    - name: Include container-puppet tasks (generate config) during step 1
+      include_tasks: generate-config-tasks.yaml
       when: step|int == 1
-      check_mode: no
-      register: generate_config_async_result
-      tags:
-        - container_config
-
-    - name: Wait for container-puppet tasks (generate config) to finish
-      async_status:
-        jid: "{{ generate_config_async_result.ansible_job_id }}"
-      register: generate_config_outputs
-      until: generate_config_outputs.finished
-      retries: 1200
-      delay: 3
-      when: step|int == 1
-      tags:
-        - container_config
-
-    - name: "Debug output for task: Run container-puppet tasks (generate config) during step {{ step }}"
-      debug:
-        var: generate_config_outputs.stdout_lines | default([]) | union(generate_config_outputs.stderr_lines | default([]))
-      when: generate_config_outputs.rc is defined
-      failed_when: generate_config_outputs.rc != 0
-      tags:
-        - container_config
-      ignore_errors: "{{ ansible_check_mode|bool }}"
-
-    - name: Diff container-puppet.py puppet-generated changes for check mode
-      shell: |
-        diff -ruN --no-dereference -q /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated
-        diff -ruN --no-dereference /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated
-      register: diff_results
-      tags:
-        - container_config
-      check_mode: no
-      when:
-        - step|int == 1
-        - ansible_check_mode|bool
-        - ansible_diff_mode
-      failed_when: false
-      changed_when: diff_results.rc == 1
-
-    - name: Diff container-puppet.py puppet-generated changes for check mode
-      debug:
-        var: diff_results.stdout_lines
-      changed_when: diff_results.rc == 1
-      when:
-        - step|int == 1
-        - ansible_check_mode|bool
-        - ansible_diff_mode
       tags:
         - container_config
 

common/deploy-steps.j2

@@ -398,6 +398,7 @@ outputs:
       all_nodes_validation_script.sh : {get_file: ../validation-scripts/all-nodes.sh}
       deploy-artifacts.sh : {get_file: ../puppet/deploy-artifacts.sh}
       hosts-config.sh: {get_file: ../scripts/hosts-config.sh}
+      generate-config-tasks: {get_file: generate-config-tasks.yaml}
       deploy_steps_playbook:
         str_replace:
           params:

common/generate-config-tasks.yaml

@@ -0,0 +1,64 @@
+- name: Run container-puppet tasks (generate config) during step 1
+  async: 3600
+  poll: 0
+  shell: "{{ python_cmd }} /var/lib/container-puppet/container-puppet.py"
+  environment:
+    NET_HOST: 'true'
+    DEBUG: '{{ docker_puppet_debug | bool }}'
+    PROCESS_COUNT: "{{ docker_puppet_process_count }}"
+    CONTAINER_CLI: "{{ container_cli }}"
+    CONFIG: '/var/lib/container-puppet/{{ ansible_check_mode | bool | ternary("check-mode/", "") }}container-puppet.json'
+    CONFIG_VOLUME_PREFIX: '/var/lib/config-data{{ ansible_check_mode | bool | ternary("/check-mode", "") }}'
+    CHECK_MODE: '{{ ansible_check_mode | bool | ternary(1, 0) }}'
+    STARTUP_CONFIG_PATTERN: '/var/lib/tripleo-config/container-startup-config/*/{{ ansible_check_mode | bool | ternary("check-mode/", "") }}*.json'
+    MOUNT_HOST_PUPPET: '{{docker_puppet_mount_host_puppet | default(true)}}'
+    CONTAINER_LOG_STDOUT_PATH: "{{ container_log_stdout_path }}"
+    CONTAINER_HEALTHCHECK_DISABLED: "{{ container_healthcheck_disabled }}"
+    SHORT_HOSTNAME: "{{ ansible_hostname }}"
+  check_mode: no
+  register: generate_config_async_result
+  tags:
+    - container_config
+
+- name: Wait for container-puppet tasks (generate config) to finish
+  async_status:
+    jid: "{{ generate_config_async_result.ansible_job_id }}"
+  register: generate_config_outputs
+  until: generate_config_outputs.finished
+  retries: 1200
+  delay: 3
+  tags:
+    - container_config
+
+- name: "Debug output for task: Run container-puppet tasks (generate config) during step 1"
+  debug:
+    var: generate_config_outputs.stdout_lines | default([]) | union(generate_config_outputs.stderr_lines | default([]))
+  when: generate_config_outputs.rc is defined
+  failed_when: generate_config_outputs.rc != 0
+  tags:
+    - container_config
+  ignore_errors: "{{ ansible_check_mode|bool }}"
+
+- name: Diff container-puppet.py puppet-generated changes for check mode
+  shell: |
+    diff -ruN --no-dereference -q /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated
+    diff -ruN --no-dereference /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated
+  register: diff_results
+  tags:
+    - container_config
+  check_mode: no
+  when:
+    - ansible_check_mode|bool
+    - ansible_diff_mode
+  failed_when: false
+  changed_when: diff_results.rc == 1
+
+- name: Diff container-puppet.py puppet-generated changes for check mode
+  debug:
+    var: diff_results.stdout_lines
+  changed_when: diff_results.rc == 1
+  when:
+    - ansible_check_mode|bool
+    - ansible_diff_mode
+  tags:
+    - container_config