fix mounts

Author: bertiethorpe

ansible/filesystems.yml

@@ -24,3 +24,22 @@
   tasks:
     - include_role:
         name: stackhpc.os-manila-mount
+
+- name: Manage /exports/cluster and Manila share info
+  hosts: control
+  become: true
+  tasks:
+    - block:
+        - name: Ensure /exports/cluster directory exists
+          file: 
+            path: /exports/cluster
+            state: directory
+            owner: root
+            group: root
+            mode: 0755
+
+        - 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"
+      when: os_manila_mount_share_info is defined

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

@@ -7,6 +7,7 @@
   vars:
     control_node_ip: "172.16.1.228"
     nfs_export_hosts: "/exports/hosts"
+    nfs_export_cluster: "/exports/cluster"
     resolv_conf_nameservers: [1.1.1.1, 8.8.8.8]
 
 
@@ -127,6 +128,20 @@
             src: "{{ nfs_server }}:{{ nfs_export }}"
             fstype: nfs
             state: "{{ nfs_client_mnt_state }}"
+        
+        - name: Ensure the mount directory exists
+          file:
+            path: /mnt/
+            state: directory
+            mode: 0755
+        
+        - name: Mount /mnt/
+          mount:
+            path: /mnt/
+            src: "{{ vars.control_node_ip }}:{{ nfs_export_cluster }}"
+            fstype: nfs
+            opts: rw,sync
+            state: mounted
 
 
     - name: Manila mount

ansible/roles/compute_init/tasks/main.yml

@@ -87,28 +87,6 @@
     group: root
     mode: 0644
 
-- name: Ensure /exports/cluster directory exists
-  file: 
-    path: /exports/cluster
-    state: directory
-    owner: root
-    group: root
-    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 }}"