support manila in compute-init

Author: sjpb

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

@@ -10,6 +10,7 @@
     enable_resolv_conf: "{{ os_metadata.meta.enable_resolv_conf | default(false) | bool }}"
     enable_etc_hosts: "{{ os_metadata.meta.enable_etc_hosts | default(false) | bool }}"
     enable_nfs: "{{ os_metadata.meta.enable_nfs | default(false) | bool }}"
+    enable_manila: "{{ os_metadata.meta.enable_manila | default(false) | bool }}"
 
     # TODO: "= role defaults" - could be moved to a vars_file: on play with similar precedence effects
     resolv_conf_nameservers: []
@@ -23,6 +24,16 @@
 
     # openhpc: no defaults required
 
+    os_manila_mount_shares: []
+    os_manila_mount_ceph_conf_path: /etc/ceph
+    os_manila_mount_state: mounted
+    os_manila_mount_opts:
+      - x-systemd.device-timeout=30
+      - x-systemd.mount-timeout=30
+      - noatime
+      - _netdev # prevents mount blocking early boot before networking available
+      - rw
+
   tasks:
     - block:
         - name: Report skipping initialization if not compute node
@@ -103,15 +114,85 @@
         mode: 0644
       when: enable_etc_hosts
 
-    # TODO: - name: NFS client mount
+    # NFS client mount
     - name: If nfs-clients is present
-      include_tasks: ../tasks/nfs-clients.yml
+      include_tasks: tasks/nfs-clients.yml
       when:
         - enable_nfs
         - nfs_enable.clients | bool or ('nfs_enable' in item and item.nfs_enable.clients | bool)
       loop: "{{ nfs_configurations }}"
 
-    # TODO: - name: Manila mount
+    - name: Manila mounts
+      block:
+        - name: Read manila share info from nfs file
+          include_vars:
+            file: /mnt/cluster/manila_share_info.yml
+          no_log: true # contains secrets
+        
+        - name: Ensure Ceph configuration directory exists
+          ansible.builtin.file:
+            path: "{{ os_manila_mount_ceph_conf_path }}"
+            state: directory
+            mode: "0755"
+            owner: root
+            group: root
+
+        - name: Configure ceph.conf using os_manila_mount_host
+          ansible.builtin.template:
+            src: ceph.conf.j2
+            dest: "{{ os_manila_mount_ceph_conf_path }}/ceph.conf"
+            owner: root
+            group: root
+            mode: "0600"
+
+        - name: Ensure mount directory exists
+          ansible.builtin.file:
+            path: "{{ item.mount_path }}"
+            state: directory
+            owner: "{{ item.mount_user | default(omit) }}"
+            group: "{{ item.mount_group | default(omit) }}"
+            mode: "{{ item.mount_mode | default(omit) }}"
+          loop: "{{ os_manila_mount_shares }}"
+          loop_control:
+            label: "{{ item.share_name }}"
+
+        - name: Write Ceph client keyring
+          ansible.builtin.template:
+            src: ceph.keyring.j2
+            dest: "{{ os_manila_mount_ceph_conf_path }}/ceph.client.{{ item.share_user }}.keyring"
+            mode: "0600"
+            owner: root
+            group: root
+          loop: "{{ os_manila_mount_share_info }}"
+          loop_control:
+            label: "{{ item.share_name }}"
+
+        - name: Mount the Ceph share
+          ansible.posix.mount:
+            path: "{{ item[0].mount_path }}"
+            src: "{{ item[1].host }}:{{ item[1].export }}"
+            fstype: ceph
+            opts: "name={{ item[1].share_user }},{{ (item[0].mount_opts | default(os_manila_mount_opts)) | join(',') }}"
+            # NB share_user is looked up here in case of autodetection
+            state: "{{ item[0].mount_state | default(os_manila_mount_state) }}"
+          loop: "{{ os_manila_mount_shares | zip(os_manila_mount_share_info) }}"
+          loop_control:
+            label: "{{ item[0].share_name }}"
+
+        - name: Ensure mounted directory has correct permissions
+          ansible.builtin.file:
+            path: "{{ item.mount_path }}"
+            state: directory
+            owner: "{{ item.mount_user | default(omit) }}"
+            group: "{{ item.mount_group | default(omit) }}"
+            mode: "{{ item.mount_mode | default(omit) }}"
+          loop: "{{ os_manila_mount_shares }}"
+          loop_control:
+            label: "{{ item.share_name }}"
+          when: item.mount_state | default(os_manila_mount_state) in ['mounted' or 'ephemeral']
+      when:
+        - enable_manila
+        - os_manila_mount_shares | length > 0
 
     # TODO: - name: Basic users setup
 

ansible/roles/compute_init/tasks/export.yml

@@ -33,3 +33,14 @@
     dest: /exports/cluster/hostvars/{{ inventory_hostname }}/hostvars.yml
     mode: u=rw,go=
   delegate_to: "{{ groups['control'] | first }}"
+
+- name: Copy manila share info to /exports/cluster
+  copy:
+    content: "{{ os_manila_mount_share_info_var | to_nice_yaml }}"
+    dest: /exports/cluster/manila_share_info.yml
+  run_once: true
+  delegate_to: "{{ groups['control'] | first }}"
+  when: os_manila_mount_share_info is defined
+  vars:
+    os_manila_mount_share_info_var:
+      os_manila_mount_share_info: "{{ os_manila_mount_share_info }}"

ansible/roles/compute_init/tasks/install.yml

@@ -2,7 +2,7 @@
 
 - name: Ensure directories exist
   file:
-    path: "/etc/ansible-init/{{ item }}"
+    path: "/etc/ansible-init/playbooks/{{ item }}"
     state: directory
     owner: root
     group: root
@@ -17,7 +17,7 @@
 - name: Inject files from roles
   copy:
     src: '{{ item.src }}'
-    dest: '/etc/ansible-init/{{ item.dest }}'
+    dest: '/etc/ansible-init/playbooks/{{ item.dest }}'
     owner: root
     group: root
     mode: 0644
@@ -30,10 +30,8 @@
       dest: templates/ceph.keyring.j2
     - src: ../../resolv_conf/files/NetworkManager-dns-none.conf
       dest: files/NetworkManager-dns-none.conf
-    - src: ../../stackhpc.os-manila-mount/library/os_manila_share.py
-      dest: library/os_manila_share.py
-    - src: ../../basic_users/filter_plugins/filter_keys.py
-      dest: filter_plugins/filter_keys.py
+    # - src: ../../basic_users/filter_plugins/filter_keys.py
+    #   dest: filter_plugins/filter_keys.py
     - src: ../../stackhpc.nfs/tasks/nfs-clients.yml
       dest: tasks/nfs-clients.yml
 

environments/.stackhpc/inventory/group_vars/all/manila.yml

@@ -0,0 +1,5 @@
+os_manila_mount_shares_arcus:
+  - share_name: slurm-v2-home
+    mount_path: /project
+
+os_manila_mount_shares: "{{ os_manila_mount_shares_arcus if ci_cloud == 'ARCUS' else [] }}"