diff --git a/ansible/roles/compute_init/README.md b/ansible/roles/compute_init/README.md
index e19b3dade..16f0987e9 100644
--- a/ansible/roles/compute_init/README.md
+++ b/ansible/roles/compute_init/README.md
@@ -72,7 +72,7 @@ it also requires an image build with the role name added to the
 | filesystems.yml          | block_devices           | None required - role deprecated | n/a                 |
 | filesystems.yml          | nfs                     | All client functionality        | No                  |
 | filesystems.yml          | manila                  | All functionality               | No [5]              |
-| filesystems.yml          | lustre                  | None at present                 | Yes                 |
+| filesystems.yml          | lustre                  | All functionality               | Yes                 |
 | extras.yml               | basic_users             | All functionality [6]           | No                  |
 | extras.yml               | eessi                   | All functionality [7]           | No                  |
 | extras.yml               | cuda                    | None required - use image build | Yes [8]             |
diff --git a/ansible/roles/compute_init/files/compute-init.yml b/ansible/roles/compute_init/files/compute-init.yml
index 90a5cfa86..906961c96 100644
--- a/ansible/roles/compute_init/files/compute-init.yml
+++ b/ansible/roles/compute_init/files/compute-init.yml
@@ -15,6 +15,7 @@
     enable_tuned:  "{{ os_metadata.meta.tuned | default(false) | bool }}"
     enable_nfs: "{{ os_metadata.meta.nfs | default(false) | bool }}"
     enable_manila: "{{ os_metadata.meta.manila | default(false) | bool }}"
+    enable_lustre: "{{ os_metadata.meta.lustre | default(false) | bool }}"
     enable_basic_users: "{{ os_metadata.meta.basic_users | default(false) | bool }}"
     enable_eessi: "{{ os_metadata.meta.eessi | default(false) | bool }}"
     enable_chrony: "{{ os_metadata.meta.chrony | default(false) | bool }}"
@@ -247,6 +248,12 @@
         - enable_manila
         - os_manila_mount_shares | length > 0
 
+    - name: Configure lustre
+      ansible.builtin.include_role:
+        name: lustre
+        tasks_from: configure.yml
+      when: enable_lustre
+
     - name: Basic users
       block:
         - name: Create groups
diff --git a/ansible/roles/compute_init/tasks/install.yml b/ansible/roles/compute_init/tasks/install.yml
index 37017b7f8..cbacb062e 100644
--- a/ansible/roles/compute_init/tasks/install.yml
+++ b/ansible/roles/compute_init/tasks/install.yml
@@ -45,6 +45,8 @@
       dest: tasks/nfs-clients.yml
     - src: ../../mrlesmithjr.chrony
       dest: roles/
+    - src: ../../lustre
+      dest: roles/
 
 - name: Add filter_plugins to ansible.cfg
   lineinfile: