harmonize containerd storage volume config

3 files changed, 14 insertions, 18 deletions

diff --git a/roles/containerd/tasks/lvm.yml b/roles/containerd/tasks/lvm.yml
index d6233ff7..93be2656 100644
--- a/roles/containerd/tasks/lvm.yml
+++ b/roles/containerd/tasks/lvm.yml
@@ -1,18 +1,18 @@
 ---
 - name: create logical volume
   lvol:
-    vg: "{{ containerd_lvm.vg }}"
-    lv: "{{ containerd_lvm.lv }}"
-    size: "{{ containerd_lvm.size }}"
+    vg: "{{ containerd_storage.vg }}"
+    lv: "{{ containerd_storage.lv }}"
+    size: "{{ containerd_storage.size }}"
 
 - name: create filesystem
   filesystem:
-    fstype: "{{ containerd_lvm.fs }}"
-    dev: "/dev/mapper/{{ containerd_lvm.vg | replace('-', '--') }}-{{ containerd_lvm.lv | replace('-', '--') }}"
+    fstype: "{{ containerd_storage.fs }}"
+    dev: "/dev/mapper/{{ containerd_storage.vg | replace('-', '--') }}-{{ containerd_storage.lv | replace('-', '--') }}"
 
 - name: mount filesytem
   mount:
-    src: "/dev/mapper/{{ containerd_lvm.vg | replace('-', '--') }}-{{ containerd_lvm.lv | replace('-', '--') }}"
+    src: "/dev/mapper/{{ containerd_storage.vg | replace('-', '--') }}-{{ containerd_storage.lv | replace('-', '--') }}"
     path: /var/lib/containerd
-    fstype: "{{ containerd_lvm.fs }}"
+    fstype: "{{ containerd_storage.fs }}"
     state: mounted
diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml
index daf613ae..f0d29a4a 100644
--- a/roles/containerd/tasks/main.yml
+++ b/roles/containerd/tasks/main.yml
@@ -4,13 +4,9 @@
   fail:
     msg: "currenty this only works with ubuntu"
 
-- name: prepare /var/lib/containerd as LVM
-  when: containerd_lvm is defined
-  import_tasks: lvm.yml
-
-- name: prepare /var/lib/containerd as ZFS dataset
-  when: containerd_zfs is defined
-  import_tasks: zfs.yml
+- name: prepare storage volume for /var/lib/containerd
+  when: containerd_storage is defined
+  import_tasks: "{{ containerd_storage.type }}.yml"
 
 - name: install containerd
   apt:
diff --git a/roles/containerd/tasks/zfs.yml b/roles/containerd/tasks/zfs.yml
index 1abf4d34..7cf33639 100644
--- a/roles/containerd/tasks/zfs.yml
+++ b/roles/containerd/tasks/zfs.yml
@@ -3,18 +3,18 @@
 ## we need to create a volume and an ext4 fs on top of that...
 - name: create zfs volume
   zfs:
-    name: "{{ containerd_zfs.pool }}/{{ containerd_zfs.name }}"
+    name: "{{ containerd_storage.pool }}/{{ containerd_storage.name }}"
     state: present
-    extra_zfs_properties: "{{ containerd_zfs.properties | default({}) | combine({'volsize': item.value.size}) }}"
+    extra_zfs_properties: "{{ containerd_storage.properties | default({}) | combine({'volsize': item.value.size}) }}"
 
 - name: create and ext4 filesystem on the zfs volume
   filesystem:
     fstype: ext4
-    dev: "/dev/zvol/{{ containerd_zfs.pool }}/{{ containerd_zfs.name }}"
+    dev: "/dev/zvol/{{ containerd_storage.pool }}/{{ containerd_storage.name }}"
 
 - name: mount filesytem
   mount:
-    src: "/dev/zvol/{{ containerd_zfs.pool }}/{{ containerd_zfs.name }}"
+    src: "/dev/zvol/{{ containerd_storage.pool }}/{{ containerd_storage.name }}"
     path: /var/lib/containerd
     fstype: ext4
     opts: defaults,x-systemd.automount,nofail