summaryrefslogtreecommitdiff
path: root/roles/containerd/tasks
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-06-15 00:09:58 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-06-15 00:09:58 +0200
commit35cf0966c3a3ab5bd519bf7a0ecc2fb9b4efea9f (patch)
tree2e1f29fdcee85170b1a5d098f1c713f93d4de768 /roles/containerd/tasks
parentnextcloud/etherpad-lite imrpoved zfs property handling (diff)
zfs backed vm volumes: improved property handling
Diffstat (limited to 'roles/containerd/tasks')
-rw-r--r--roles/containerd/tasks/zfs.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/roles/containerd/tasks/zfs.yml b/roles/containerd/tasks/zfs.yml
index 2ebcae3c..1abf4d34 100644
--- a/roles/containerd/tasks/zfs.yml
+++ b/roles/containerd/tasks/zfs.yml
@@ -1,16 +1,11 @@
---
## containerd from ubuntu doesn't support zfs directly
## we need to create a volume and an ext4 fs on top of that...
-- name: verify that the zfs volsize property is set
- assert:
- msg: "contained does not support zfs directly - please set the volsize property to make it a volume"
- that: "'volsize' in containerd_zfs.properties"
-
- name: create zfs volume
zfs:
name: "{{ containerd_zfs.pool }}/{{ containerd_zfs.name }}"
state: present
- extra_zfs_properties: "{{ containerd_zfs.properties }}"
+ extra_zfs_properties: "{{ containerd_zfs.properties | default({}) | combine({'volsize': item.value.size}) }}"
- name: create and ext4 filesystem on the zfs volume
filesystem: