simplify lustre defaults

Author: sjpb

ansible/roles/lustre/README.md

@@ -8,12 +8,12 @@ Install and configure a Lustre client. This builds RPM packages from source.
 ## Role Variables
 
 - `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_mounts`: Required list. Define Lustre filesystems and mountpoints as a list of dicts with possible keys:
     - `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`.
+  Any of these parameters may alternatively be specified as role variables prefixed `lustre_`. If both are given entries in `lustre_mounts` take priority.
 
 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,5 +1,5 @@
 lustre_version: '2.15.5-RC3' # TODO: FIXME to 2.15.5 on release see http://lists.lustre.org/pipermail/lustre-discuss-lustre.org/2024-June/019163.html
-lustre_mounts: [{}] # Ensures if all top-level vars are provided then this isn't required
+lustre_mounts: []
 #lustre_mgs_nid:
 #lustre_fs_name:
 lustre_mount_point: "/mnt/lustre/{{ lustre_fs_name }}"