port elevate/media role to new storage volume roles

2 files changed, 23 insertions, 44 deletions

diff --git a/roles/elevate/media/tasks/nextcloud-lvm.yml b/roles/elevate/media/tasks/nextcloud-lvm.yml
deleted file mode 100644
index d24326d3..00000000
--- a/roles/elevate/media/tasks/nextcloud-lvm.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- name: prepare nextcloud system disk as LVM
-  when: nextcloud_lvm.system is defined
-  block:
-  - name: create logical volume
-    lvol:
-      vg: "{{ nextcloud_lvm.system.vg }}"
-      lv: "{{ nextcloud_lvm.system.lv }}"
-      size: "{{ nextcloud_lvm.system.size }}"
-
-  - name: create filesystem
-    filesystem:
-      fstype: "{{ nextcloud_lvm.system.fs }}"
-      dev: "/dev/mapper/{{ nextcloud_lvm.system.vg | replace('-', '--') }}-{{ nextcloud_lvm.system.lv | replace('-', '--') }}"
-
-  - name: mount filesytem
-    mount:
-      src: "/dev/mapper/{{ nextcloud_lvm.system.vg | replace('-', '--') }}-{{ nextcloud_lvm.system.lv | replace('-', '--') }}"
-      path: /srv/nextcloud
-      fstype: "{{ nextcloud_lvm.system.fs }}"
-      state: mounted
-
-- name: prepare nextcloud data disk as LVM
-  when: nextcloud_lvm.data is defined
-  block:
-  - name: create logical volume
-    lvol:
-      vg: "{{ nextcloud_lvm.data.vg }}"
-      lv: "{{ nextcloud_lvm.data.lv }}"
-      size: "{{ nextcloud_lvm.data.size }}"
-
-  - name: create filesystem
-    filesystem:
-      fstype: "{{ nextcloud_lvm.data.fs }}"
-      dev: "/dev/mapper/{{ nextcloud_lvm.data.vg | replace('-', '--') }}-{{ nextcloud_lvm.data.lv | replace('-', '--') }}"
-
-  - name: mount filesytem
-    mount:
-      src: "/dev/mapper/{{ nextcloud_lvm.data.vg | replace('-', '--') }}-{{ nextcloud_lvm.data.lv | replace('-', '--') }}"
-      path: /srv/ncdata
-      fstype: "{{ nextcloud_lvm.data.fs }}"
-      state: mounted
diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml
index e9be69d2..92195f4c 100644
--- a/roles/elevate/media/tasks/nextcloud.yml
+++ b/roles/elevate/media/tasks/nextcloud.yml
@@ -1,6 +1,27 @@
 ---
-- name: preare nextcloud disks
-  import_tasks: nextcloud-lvm.yml
+- name: prepare nextcloud system disk as LVM
+  when: nextcloud_lvm.system is defined
+  vars:
+    lvm_volume:
+      vg: "{{ nextcloud_lvm.system.vg }}"
+      lv: "{{ nextcloud_lvm.system.lv }}"
+      size: "{{ nextcloud_lvm.system.size }}"
+      fs: "{{ nextcloud_lvm.system.fs }}"
+      dest: /srv/nextcloud
+  include_role:
+    name: storage/lvm/volume
+
+- name: prepare nextcloud data disk as LVM
+  when: nextcloud_lvm.data is defined
+  vars:
+    lvm_volume:
+      vg: "{{ nextcloud_lvm.data.vg }}"
+      lv: "{{ nextcloud_lvm.data.lv }}"
+      size: "{{ nextcloud_lvm.data.size }}"
+      fs: "{{ nextcloud_lvm.data.fs }}"
+      dest: /srv/ncdata
+  include_role:
+    name: storage/lvm/volume
 
 - name: create nextcloud config directory
   file: