diff options
| -rw-r--r-- | inventory/host_vars/sk-cloudia/vars.yml | 6 | ||||
| -rw-r--r-- | inventory/host_vars/sk-tomnext-nc.yml | 8 | ||||
| -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 |
5 files changed, 18 insertions, 12 deletions
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml index 085a9c95..d7a2474e 100644 --- a/inventory/host_vars/sk-cloudia/vars.yml +++ b/inventory/host_vars/sk-cloudia/vars.yml @@ -26,12 +26,14 @@ zfs_zpools: docker_zfs: pool: storage name: docker - size: 40G + properties: + quota: 40G kubelet_zfs: pool: storage name: kubelet - size: 20G + properties: + quota: 20G kubernetes_version: 1.18.2 kubernetes_container_runtime: docker diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index cef64bb0..766bdcff 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -61,12 +61,14 @@ zfs_sanoid_modules: docker_zfs: pool: storage name: docker - size: 15G + properties: + quota: 15G kubelet_zfs: pool: storage name: kubelet - size: 15G + properties: + quota: 15G kubernetes_version: 1.18.3 kubernetes_container_runtime: docker @@ -96,7 +98,7 @@ nextcloud_zfs: nextcloud_instances: team.tomwaitz.eu: # new: true - version: 18.0.4 + version: 18.0.6 port: 8100 hostnames: - team.tomwaitz.eu 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: |