Merge branch 'feat-add-base-img' into 'main'

Rearrange tasks between roles to build a base image.

Closes #44

See merge request rc/packer-openstack-hpc-image!30

ansible/node-compute.yml

 ---
-- name: Run a play
-  ansible.builtin.import_playbook: node.yml
-  
 - name: Setup node for use as a virtual compute node
   hosts: default
   become: true
   roles:
-    - { name: 'compute_packages', tags: 'compute_packages' }
     - { name: 'pam_slurm_adopt', tags: 'pam_slurm_adopt' }

ansible/node.yml

@@ -3,5 +3,4 @@
   hosts: default
   become: true
   roles:
-    - { name: 'cheaha.node', tags: 'cheaha.node' }
-    - { name: 'lmod_user', tags: 'lmod_user' }
+    - { name: 'compute_packages', tags: 'compute_packages' }

ansible/roles/cheaha.node/tasks/main.yml

@@ -13,27 +13,9 @@
     path: /etc/dhcp/dhclient.conf
     insertbefore: BOF
     line: 'append domain-name " cm.cluster rc.uab.edu ib.cluster drac.cluster eth.cluster ib-hdr.cluster";'
-- name: Install prerequisite packages
-  yum:
-    name: epel-release
-    state: present
 - name: Disable SELinux
   ansible.posix.selinux:
     state: disabled
-- name: Copy cm.repo into place (consider making this a template)
-  ansible.builtin.copy:
-    src: cm.repo
-    dest: /etc/yum.repos.d/cm.repo
-    owner: root
-    group: root
-    mode: 0644
-- name: Copy CM repo GPG key
-  ansible.builtin.copy:
-    src: RPM-GPG-KEY-cm
-    dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-cm
-    owner: root
-    group: root
-    mode: 0644
 - name: Create slurm group
   ansible.builtin.group:
     name: slurm
@@ -45,19 +27,6 @@
     state: present
     uid: 450
     group: slurm
-- name: Install required packages
-  yum:
-    name:
-      - slurm-client-18.08.9
-      - munge-0.5.13
-      - openldap-servers-2.4.48
-      - Lmod-7.7.14
-      - cm-modules-init-client-8.2
-      - cmdaemon
-      - nss-pam-ldapd
-      - ruby
-      - python3
-    state: present
 - name: Update nsswitch.conf to look for ldap
   ansible.builtin.replace:
     dest: /etc/nsswitch.conf

ansible/roles/compute_packages/tasks/main.yml

 ---
 # tasks file for cheaha.packages
+- name: Install prerequisite packages
+  yum:
+    name: epel-release
+    state: present
 
 - name: Copy yum repo files into place
   ansible.builtin.copy:
@@ -9,17 +13,40 @@
     group: root
     mode: 0644
   loop:
+    - cm.repo
     - ceph.repo
     - dell-system-update.repo
     - elastic.repo
     - nux-dextop.repo
     - TurboVNC.repo
 
+- name: Copy CM repo GPG key
+  ansible.builtin.copy:
+    src: RPM-GPG-KEY-cm
+    dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-cm
+    owner: root
+    group: root
+    mode: 0644
+
 - name: Install openstack-rocky repo
   ansible.builtin.yum:
     name: centos-release-openstack-rocky
     state: present
 
+- name: Install required packages
+  yum:
+    name:
+      - slurm-client-18.08.9
+      - munge-0.5.13
+      - openldap-servers-2.4.48
+      - Lmod-7.7.14
+      - cm-modules-init-client-8.2
+      - cmdaemon
+      - nss-pam-ldapd
+      - ruby
+      - python3
+    state: present
+
 - name: Install system packages
   ansible.builtin.yum:
     name: "{{ lookup('file', '{{ pkg_list_file }}').splitlines() }}"