diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-06-14 16:26:00 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-06-14 16:26:00 +0200 |
| commit | bbb9f4e09ba78eaf518d8e66caf5a437ebc6439b (patch) | |
| tree | c24b6d52ec11cb545d95f7f233555147ad0801c3 /roles | |
| parent | install fzf on ch-equinox-ws (diff) | |
docker/containerd/kubelet: more flexible handling of zfs properties
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/containerd/tasks/zfs.yml | 10 | ||||
| -rw-r--r-- | roles/docker/tasks/zfs.yml | 3 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/zfs.yml | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/roles/containerd/tasks/zfs.yml b/roles/containerd/tasks/zfs.yml index 60c6f3fd..2ebcae3c 100644 --- a/roles/containerd/tasks/zfs.yml +++ b/roles/containerd/tasks/zfs.yml @@ -1,12 +1,16 @@ --- ## containerd from ubuntu doesn't support zfs directly -## we need to create a volume create an ext4 fs on top of that... +## 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: - volsize: "{{ containerd_zfs.size }}" + extra_zfs_properties: "{{ containerd_zfs.properties }}" - name: create and ext4 filesystem on the zfs volume filesystem: diff --git a/roles/docker/tasks/zfs.yml b/roles/docker/tasks/zfs.yml index 3301e310..052a811e 100644 --- a/roles/docker/tasks/zfs.yml +++ b/roles/docker/tasks/zfs.yml @@ -3,8 +3,7 @@ zfs: name: "{{ docker_zfs.pool }}/{{ docker_zfs.name }}" state: present - extra_zfs_properties: - quota: "{{ docker_zfs.size }}" + extra_zfs_properties: "{{ docker_zfs.properties | default(omit) }}" - name: bind mount filesytem mount: diff --git a/roles/kubernetes/base/tasks/zfs.yml b/roles/kubernetes/base/tasks/zfs.yml index 4311dd3f..4489bf0a 100644 --- a/roles/kubernetes/base/tasks/zfs.yml +++ b/roles/kubernetes/base/tasks/zfs.yml @@ -3,8 +3,7 @@ zfs: name: "{{ kubelet_zfs.pool }}/{{ kubelet_zfs.name }}" state: present - extra_zfs_properties: - quota: "{{ kubelet_zfs.size }}" + extra_zfs_properties: "{{ kubelet_zfs.properties | default(omit) }}" - name: bind mount filesytem mount: |