merge conflict fixes

Author: wtripp180901

ansible/cleanup.yml

@@ -43,3 +43,28 @@
   ansible.builtin.file:
     path: /var/lib/ansible-init.done
     state: absent
+    
+- name: Get package facts
+  package_facts:
+
+- name: Ensure image summary directory exists
+  file:
+    path: /var/lib/image/
+    state: directory
+    owner: root
+    group: root
+    mode: u=rwX,go=rX
+
+- name: Write image summary
+  copy:
+    content: "{{ image_info | to_nice_json }}"
+    dest: /var/lib/image/image.json
+  vars:
+    image_info:
+      branch: "{{ lookup('pipe', 'git rev-parse --abbrev-ref HEAD') }}"
+      build: "{{  ansible_nodename | split('.') | first }}" # hostname is image name, which contains build info
+      os: "{{ ansible_distribution }} {{ ansible_distribution_version }}"
+      kernel: "{{ ansible_kernel }}"
+      ofed: "{{ ansible_facts.packages['mlnx-ofa_kernel'].0.version | default('-') }}"
+      cuda:  "{{ ansible_facts.packages['cuda'].0.version | default('-') }}"
+      slurm-ohpc: "{{ ansible_facts.packages['slurm-ohpc'].0.version | default('-') }}"

ansible/fatimage.yml

@@ -177,9 +177,9 @@
 
 - hosts: builder
   become: yes
-  gather_facts: no
+  gather_facts: yes
+  tags: finalise
   tasks:
-    # - meta: end_here
     - name: Cleanup image
       import_tasks: cleanup.yml