move manila share info mount to compute_init role

Author: bertiethorpe

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

@@ -3,19 +3,16 @@
 - name: Compute node initialisation
   hosts: localhost
   become: yes
+  # VARS TO BE SUPPLIED VIA CLOUD INIT METADATA
   vars:
     control_node_ip: "172.16.1.228"
     nfs_export_hosts: "/exports/hosts"
     resolv_conf_nameservers: [1.1.1.1, 8.8.8.8]
 
-    # block device (disk) on which to create the exported filesystem.
-    # if the disk is not defined, formatting and mounting will not be done.
+
     nfs_disk_location:
-    # Path to exported filesystem mountpoint on nfs servers
     nfs_export: "/exports/home"
-    # nfs client mount options
     nfs_client_mnt_options:
-    # Path to mountpoint on nfs clients
     nfs_client_mnt_point: "/home"
     nfs_client_mnt_state: mounted
     nfs_server: "{{ control_node_ip }}"
@@ -48,7 +45,6 @@
     basic_users_groups: []
 
 
-    # Default to 10GB
     cvmfs_quota_limit_mb: 10000
     cvmfs_config_default:
       CVMFS_CLIENT_PROFILE: single
@@ -137,7 +133,7 @@
       block:
         - name: Read manila share from nfs file
           slurp:
-            src: "/mnt/cluster/manila_share_info.yml"
+            src: "/mnt/manila_share_info.yml"
           register: manila_share_info_file
 
         - name: Parse and set fact for manila share info

ansible/roles/compute_init/tasks/main.yml

@@ -96,14 +96,26 @@
     mode: 0644
   delegate_to: "{{ groups['control'] | first }}"
 
+- name: Ensure /exports/cluster exists on control node
+  ansible.builtin.file:
+    path: /exports/cluster
+    state: directory
+    mode: '0755'
+  delegate_to: "{{ groups['control'] | first }}"
+
+- name: Copy manila share info to /exports/cluster
+  copy:
+    content: "{{ os_manila_mount_share_info | to_nice_yaml }}"
+    dest: "/exports/cluster/manila_share_info.yml"
+  delegate_to: "{{ groups['control'] | first }}"
+
 - name: Write openhpc munge key
   copy:
     content: "{{ vault_openhpc_mungekey | b64decode }}"
     dest: "/exports/cluster/openhpc_munge.key"
     owner: munge
     group: munge
     mode: 0400
-  become: true
   delegate_to: "{{ groups['control'] | first }}"