allow definition of multiple lustre_mounts

Author: sjpb

ansible/roles/lustre/README.md

@@ -9,11 +9,11 @@ Install and configure a Lustre client. This builds RPM packages from source.
 
 - `lustre_version`: Optional str. Version of lustre to build, default '2.15.64'. TODO: EXPLAIN. See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
 - `lustre_mounts`: Optional list. Define Lustre filesystems and mountpoints as a list of dicts with possible keys:
-    - `lustre_mgs_nid`: The NID for the MGS, e.g. `192.168.227.11@tcp1`
-    - `lustre_fs_name`: The name of the filesystem to mount
-    - `lustre_mount_point`: Path to mount filesystem at. Default is `/mnt/lustre/{{ lustre_fs_name}}`
-    - `lustre_mount_state`: Mountpoint state, as for [ansible.posix.mount](https://docs.ansible.com/ansible/latest/collections/ansible/posix/mount_module.html#parameter-state). Default `mounted`.
-  These parameters may alternatively be specified as role variables of the same name, which are lower-priority than entries in `lustre_mounts`. 
+    - `mgs_nid`: The NID for the MGS, e.g. `192.168.227.11@tcp1`
+    - `fs_name`: The name of the filesystem to mount
+    - `mount_point`: Path to mount filesystem at. Default is `/mnt/lustre/{{ lustre_fs_name}}`
+    - `mount_state`: Mountpoint state, as for [ansible.posix.mount](https://docs.ansible.com/ansible/latest/collections/ansible/posix/mount_module.html#parameter-state). Default `mounted`.
+  These parameters may alternatively be specified as role variables prefixed `lustre_`, which are lower-priority than entries in `lustre_mounts`.
 
 The following variables control the package build and and install and should not generally be required:
 - `lustre_build_packages`: Optional list. Prerequisite packages required to build Lustre. See `defaults/main.yml`.

ansible/roles/lustre/defaults/main.yml

@@ -1,7 +1,9 @@
 
 lustre_version: 'b2_15' # TODO: FIXME to 2.15.5 on release see http://lists.lustre.org/pipermail/lustre-discuss-lustre.org/2024-June/019163.html
-lustre_mounts: []
-lustre_mount_point: /mnt/lustre
+lustre_mounts: [{}] # Ensures if all top-level vars are provided then this isn't required
+#lustre_mgs_nid:
+#lustre_fs_name:
+lustre_mount_point: "/mnt/lustre/{{ lustre_fs_name }}"
 lustre_mount_state: mounted
 
 # below variables are for build and should not generally require changes

ansible/roles/lustre/tasks/configure.yml

@@ -1,9 +1,18 @@
+- name: Ensure mount points exist
+  ansible.builtin.file:
+    path: "{{ item.mount_point | default(lustre_mount_point) }}/{{ item.fs_name | default(lustre_fs_name) }}"
+    state: directory
+  loop: "{{ lustre_mounts }}"
+  when: "item.mount_state | default(lustre_mount_state) != 'absent'"
+# TODO: do we need to set owner/group/mode either pre- or post-mount?
+
 # TODO: is this an ok way of doing it?
 - name: Mount lustre filesystem
-  mount:
+  ansible.posix.mount:
     fstype: lustre
-    src: "{{ lustre_mgs_nid }}:/{{ lustre_fs_name }}"
-    path: "{{ lustre_mount_point }}"
+    src: "{{ item.mgs_nid | default(lustre_mgs_nid) }}:/{{ item.lustre_fs_name | default(lustre_fs_name) }}"
+    path: "{{ item.mount_point | default(lustre_mount_point) }}/{{ item.fs_name | default(lustre_fs_name) }}"
     state: "{{ lustre_mount_state }}"
     opts: "defaults,_netdev,noauto,x-systemd.automount,x-systemd.requires=lnet.service"
     # opts are systemd defaults from http://wiki.lustre.org/Mounting_a_Lustre_File_System_on_Client_Nodes
+  loop: "{{ lustre_mounts }}"

ansible/roles/lustre/tasks/validate.yml

@@ -15,12 +15,12 @@
 
 - name: Ensure lustre_mgs_nid is defined
   assert:
-    that: item.lustre_mgs_nid | default(lustre_mgs_nid) is defined
-    fail_msg: lustre_mgs_nid must be defined or specified in lustre_mounts elements
+    that: item.mgs_nid | default(lustre_mgs_nid) is defined
+    fail_msg: lustre_mounts entries must specify mgs_nid or lustre_mgs_nid must be defined
   loop: "{{ lustre_mounts }}"
 
 - name: Ensure lustre_fs_name is defined
   assert:
     that: item.lustre_fs_name | default(lustre_fs_name) is defined
-    fail_msg: lustre_fs_name must be defined or specified in lustre_mounts elements
+    fail_msg: lustre_mounts entries must specify fs_name or lustre_fs_name must be specified
   loop: "{{ lustre_mounts }}"