Merge "Move some common tasks to step 1" into stable/train

common/deploy-steps-tasks-step-1.yaml

@@ -291,3 +291,64 @@
             label: "{{ item[0] }}"
           tags:
             - container_startup_configs
+
+        - name: gather facts needed by role
+          setup:
+            gather_subset: "!min,python"
+          when: ansible_python is not defined
+          tags:
+            - container_config_tasks
+
+        - name: set python_cmd
+          set_fact:
+            python_cmd: "python{{ ansible_python.version.major }}"
+            cacheable: true
+          when: python_cmd is not defined
+          tags:
+            - container_config_tasks
+
+        - name: Set host puppet debugging fact string
+          set_fact:
+            host_puppet_config_debug: "--debug --verbose"
+          when:
+            - enable_puppet | bool
+            - enable_debug | bool
+          tags:
+            - host_config
+
+        - name: Check for /etc/puppet/check-mode directory for check mode
+          stat:
+            path: /etc/puppet/check-mode
+          register: check_mode_dir
+          when: ansible_check_mode|bool
+          tags:
+            - host_config
+            - container_config
+
+        - name: Create /etc/puppet/check-mode/hieradata directory for check mode
+          file:
+            path: /etc/puppet/check-mode/hieradata
+            state: directory
+            setype: svirt_sandbox_file_t
+            selevel: s0
+            recurse: true
+          check_mode: no
+          when:
+            - ansible_check_mode|bool
+            - not check_mode_dir.stat.exists
+          tags:
+            - host_config
+            - container_config
+
+        - name: Create puppet check-mode files if they don't exist for check mode
+          shell: |
+            cp -a /etc/puppet/hiera.yaml /etc/puppet/check-mode/hiera.yaml
+            cp -a /etc/puppet/hieradata/* /etc/puppet/check-mode/hieradata/
+            sed -i 's/\/etc\/puppet\/hieradata/\/etc\/puppet\/check-mode\/hieradata/' /etc/puppet/check-mode/hiera.yaml
+          when:
+            - ansible_check_mode|bool
+            - not check_mode_dir.stat.exists
+          check_mode: no
+          tags:
+            - host_config
+            - container_config

common/deploy-steps-tasks.yaml

@@ -1,60 +1,10 @@
     # Note the indentation here is required as it's joined
     # to create a playbook in deploy-steps.j2
-    ##################################################
-    # Step 1 block, write data for subsequent steps
-    ##################################################
-    - name: gather facts needed by role
-      setup:
-        gather_subset: "!min,python"
-      when: ansible_python is not defined
-      tags:
-        - container_config_tasks
-
-    - name: set python_cmd
-      set_fact:
-        python_cmd: "python{{ ansible_python.version.major }}"
-        cacheable: true
-      when: python_cmd is not defined
-      tags:
-        - container_config_tasks
 
     #####################################################
     # Per step puppet configuration of the baremetal host
     #####################################################
 
-    - name: Set host puppet debugging fact string
-      set_fact:
-        host_puppet_config_debug: "--debug --verbose"
-      when:
-        - enable_puppet | bool
-        - enable_debug | bool
-      tags:
-        - host_config
-
-    - name: Check for /etc/puppet/check-mode directory for check mode
-      stat:
-        path: /etc/puppet/check-mode
-      register: check_mode_dir
-      when: ansible_check_mode|bool
-      tags:
-        - host_config
-        - container_config
-
-    - name: Create /etc/puppet/check-mode/hieradata directory for check mode
-      file:
-        path: /etc/puppet/check-mode/hieradata
-        state: directory
-        setype: svirt_sandbox_file_t
-        selevel: s0
-        recurse: true
-      check_mode: no
-      when:
-        - ansible_check_mode|bool
-        - not check_mode_dir.stat.exists
-      tags:
-        - host_config
-        - container_config
-
     - name: Write the config_step hieradata
       no_log: True
       copy:
@@ -66,19 +16,6 @@
       tags:
         - host_config
 
-    - name: Create puppet check-mode files if they don't exist for check mode
-      shell: |
-        cp -a /etc/puppet/hiera.yaml /etc/puppet/check-mode/hiera.yaml
-        cp -a /etc/puppet/hieradata/* /etc/puppet/check-mode/hieradata/
-        sed -i 's/\/etc\/puppet\/hieradata/\/etc\/puppet\/check-mode\/hieradata/' /etc/puppet/check-mode/hiera.yaml
-      when:
-        - ansible_check_mode|bool
-        - not check_mode_dir.stat.exists
-      check_mode: no
-      tags:
-        - host_config
-        - container_config
-
     - name: Run puppet host configuration for step {{ step }}
       when: enable_puppet|bool
       shell: >-