simplify lustre mount logic

Author: sjpb

ansible/roles/lustre/defaults/main.yml

@@ -1,8 +1,7 @@
 lustre_version: '2.15.5' # https://www.lustre.org/lustre-2-15-5-released/
-lustre_mounts: []
 #lustre_subnet_cidr:
 #lustre_mgs_nid:
-#lustre_fs_name:
+lustre_fs_name: lustre
 lustre_mount_point: "/mnt/lustre/{{ lustre_fs_name }}"
 lustre_mount_state: mounted
 

ansible/roles/lustre/tasks/configure.yml

@@ -16,34 +16,34 @@
     that: _lustre_interface is defined
     fail_msg: "No interface was found for lustre_subnet_cidr={{ lustre_subnet_cidr }}"
 
-- name: Write LNet configuration file
-  template:
-    src: lnet.conf.j2
-    dest:  /etc/lnet.conf # exists from package install
-    owner: root
-    group: root
-    mode: u=rw,go=r # from package install
-  register: _lnet_conf
+# - name: Write LNet configuration file
+#   template:
+#     src: lnet.conf.j2
+#     dest:  /etc/lnet.conf # exists from package install, expected by lnet service
+#     owner: root
+#     group: root
+#     mode: u=rw,go=r # from package install
+#   register: _lnet_conf
 
-- name: Import LNet configuration
-  command: lnetctl import /etc/lnet.conf
-  when: _lnet_conf.changed
+# - name: Ensure lnet service state
+#   systemd_service:
+#     name: lnet
+#     state: "'restarted' if _lnet_conf.changed else 'started'"
+#   when: _lnet_conf.changed
 
 - name: Ensure mount points exist
   ansible.builtin.file:
-    path: "{{ item.mount_point | default(lustre_mount_point) }}/{{ item.fs_name | default(lustre_fs_name) }}"
+    path: "{{ lustre_mount_point }}"
     state: directory
-  loop: "{{ lustre_mounts }}"
-  when: "item.mount_state | default(lustre_mount_state) != 'absent'"
+  when: "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
   ansible.posix.mount:
     fstype: lustre
-    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) }}"
+    src: "{{ lustre_mgs_nid }}:/{{ lustre_fs_name }}"
+    path: "{{ lustre_mount_point }}"
     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 }}"