From 65e14112685211a3fc55e2e4ace50e2adb04ac83 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 4 Apr 2021 16:35:46 +0200 Subject: harmonize containerd storage volume config --- roles/containerd/tasks/zfs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/containerd/tasks/zfs.yml') 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 -- cgit v1.2.3