refactor cacerts compute-init to use role directly

Author: sjpb

ansible/roles/compute_init/files/compute-init.yml

@@ -19,8 +19,6 @@
     # TODO: "= role defaults" - could be moved to a vars_file: on play with similar precedence effects
     resolv_conf_nameservers: []
 
-    cacerts_cert_dir: "/mnt/cluster/cacerts"
-
     tuned_profile_baremetal: hpc-compute
     tuned_profile_vm: virtual-guest
     tuned_profile: "{{ tuned_profile_baremetal if ansible_virtualization_role != 'guest' else tuned_profile_vm }}"
@@ -136,7 +134,10 @@
       when: enable_etc_hosts
 
     - name: Configure cacerts
-      include_tasks: tasks/cacerts.yml
+      ansible.builtin.include_role:
+        name: cacerts
+      vars:
+        cacerts_cert_dir: "/mnt/cluster/cacerts"
       when: enable_cacerts
 
     - name: Configure tuned

ansible/roles/compute_init/tasks/install.yml

@@ -32,8 +32,8 @@
       dest: files/NetworkManager-dns-none.conf
     - src: ../../basic_users/filter_plugins/filter_keys.py
       dest: filter_plugins/filter_keys.py
-    - src: ../../cacerts/tasks/configure.yml
-      dest: tasks/cacerts.yml
+    - src: ../../cacerts
+      dest: roles/
     - src: ../../tuned/tasks/configure.yml
       dest: tasks/tuned.yml
     - src: ../../stackhpc.nfs/tasks/nfs-clients.yml