From 35cf0966c3a3ab5bd519bf7a0ecc2fb9b4efea9f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 15 Jun 2020 00:09:58 +0200 Subject: zfs backed vm volumes: improved property handling --- roles/containerd/tasks/zfs.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'roles/containerd/tasks/zfs.yml') 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: -- cgit v1.2.3