diff options
| -rw-r--r-- | inventory/host_vars/sk-cloudia/vars.yml | 2 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/Debian.yml | 18 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/Ubuntu.yml | 2 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/main.yml | 19 |
4 files changed, 23 insertions, 18 deletions
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml index d4c871a3..44090907 100644 --- a/inventory/host_vars/sk-cloudia/vars.yml +++ b/inventory/host_vars/sk-cloudia/vars.yml @@ -31,7 +31,7 @@ kubelet_zfs: name: kubelet size: 20G -kubernetes_version: 1.17.2 +kubernetes_version: 1.17.5 kubernetes_container_runtime: containerd kubernetes_standalone_max_pods: 42 kubernetes_standalone_resolv_conf: /var/run/systemd/resolve/resolv.conf diff --git a/roles/zfs/base/tasks/Debian.yml b/roles/zfs/base/tasks/Debian.yml new file mode 100644 index 00000000..450d9300 --- /dev/null +++ b/roles/zfs/base/tasks/Debian.yml @@ -0,0 +1,18 @@ +--- +## TODO: make sure contrib repo is enabled + +- name: install zfs-dkms + apt: + name: zfs-dkms + state: present + +- name: check if module is available for the currently running kernel + command: modprobe --dry-run zfs + check_mode: no + register: zfs_module_available + failed_when: false + changed_when: false + +- name: rebuild zfs module + when: zfs_module_available.rc != 0 + command: dpkg-reconfigure zfs-dkms diff --git a/roles/zfs/base/tasks/Ubuntu.yml b/roles/zfs/base/tasks/Ubuntu.yml new file mode 100644 index 00000000..0ce85358 --- /dev/null +++ b/roles/zfs/base/tasks/Ubuntu.yml @@ -0,0 +1,2 @@ +--- +# Nothing to do here. diff --git a/roles/zfs/base/tasks/main.yml b/roles/zfs/base/tasks/main.yml index 0a968235..e6f2347b 100644 --- a/roles/zfs/base/tasks/main.yml +++ b/roles/zfs/base/tasks/main.yml @@ -7,23 +7,8 @@ options zfs zfs_arc_max={{ zfs_arc_size.max }} dest: /etc/modprobe.d/zfs.conf -## TODO: @debian: make sure contrib repo is added - -- name: install zfs packages - apt: - name: zfs-dkms - state: present - -- name: check if module is available for the currently running kernel - command: modprobe --dry-run zfs - check_mode: no - register: zfs_module_available - failed_when: false - changed_when: false - -- name: rebuild zfs module - when: zfs_module_available.rc != 0 - command: dpkg-reconfigure zfs-dkms +- name: install zfs modules + include_tasks: "{{ ansible_distribution }}.yml" - name: load zfs kernel module modprobe: |