move manila mount share to nfs export

Author: bertiethorpe

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

@@ -8,15 +8,12 @@
     control_node_ip: "172.16.1.228"
     resolv_conf_nameservers: [1.1.1.1, 8.8.8.8]
 
-
     nfs_export: "/exports/home"
     nfs_client_mnt_options:
     nfs_client_mnt_point: "/home"
     nfs_client_mnt_state: mounted
     nfs_server: "{{ control_node_ip }}"
 
-
-    os_manila_mount_shares: []
     os_manila_mount_state: mounted
     os_manila_mount_opts:
       - x-systemd.device-timeout=30
@@ -26,7 +23,6 @@
       - rw
     os_manila_mount_ceph_conf_path: /etc/ceph
 
-
     basic_users_manage_homedir: false
     basic_users_userdefaults:
       state: present
@@ -38,10 +34,8 @@
       - name: testuser # can't use rocky as $HOME isn't shared!
         password: "{{ test_user_password | password_hash('sha512', 65534 | random(seed=inventory_hostname) | string) }}" # idempotent
         uid: 1005
-        state: present
     basic_users_groups: []
 
-
     openhpc_conf_server: "{{ control_node_ip }}"
 
   tasks:
@@ -114,15 +108,25 @@
 
     - name: Manila mount
       block:
-        - name: Read manila share from nfs file
+        - name: Read manila share info from nfs file
           slurp:
             src: "/mnt/cluster/manila_share_info.yml"
           register: manila_share_info_file
+          no_log: true
 
         - name: Parse and set fact for manila share info
           set_fact:
             os_manila_mount_share_info: "{{ manila_share_info_file.content | b64decode | from_yaml }}"
 
+        - name: Read manila shares from nfs file
+          slurp:
+            src: "/mnt/cluster/manila_shares.yml"
+          register: manila_shares_file
+
+        - name: Parse and set fact for manila shares
+          set_fact:
+            os_manila_mount_shares: "{{ manila_shares_file.content | b64decode | from_yaml }}"
+
         - name: Ensure Ceph configuration directory exists
           ansible.builtin.file:
             path: "{{ os_manila_mount_ceph_conf_path }}"

ansible/roles/compute_init/tasks/main.yml

@@ -91,6 +91,12 @@
         content: "{{ os_manila_mount_share_info | to_nice_yaml }}"
         dest: "/exports/cluster/manila_share_info.yml"
       when: os_manila_mount_share_info is defined
+      
+    - name: Copy manila mount shares to /exports/cluster
+      copy:
+        content: "{{ os_manila_mount_shares | to_nice_yaml }}"
+        dest: "/exports/cluster/manila_shares.yml"
+      when: os_manila_mount_shares is defined
 
     - name: Ensure /exports/cluster/cvmfs directory exists
       file: