summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/vm/host/tasks/network.yml1
-rw-r--r--roles/zfs/base/tasks/Debian.yml25
-rw-r--r--roles/zfs/base/tasks/Ubuntu.yml5
-rw-r--r--roles/zfs/base/tasks/main.yml7
4 files changed, 25 insertions, 13 deletions
diff --git a/roles/vm/host/tasks/network.yml b/roles/vm/host/tasks/network.yml
index bc207805..0688ec42 100644
--- a/roles/vm/host/tasks/network.yml
+++ b/roles/vm/host/tasks/network.yml
@@ -69,3 +69,4 @@
label: "br-{{ item.item.key }}"
when: item is changed
command: "/sbin/ifup br-{{ item.item.key }}"
+ failed_when: false
diff --git a/roles/zfs/base/tasks/Debian.yml b/roles/zfs/base/tasks/Debian.yml
index e13c03f5..2a3d608e 100644
--- a/roles/zfs/base/tasks/Debian.yml
+++ b/roles/zfs/base/tasks/Debian.yml
@@ -10,24 +10,37 @@
- apt_repo_components is defined
- "'contrib' in apt_repo_components"
-- name: install zfs-dkms (buster)
+- name: install zfs-dkms and utilities (buster)
when: (ansible_distribution_major_version | int) == 10
block:
- name: add backports repo
include_role:
name: apt-repo/backports
- - name: install zfs-dkms from backports
+ - name: install zfs modules via dkms
apt:
name: zfs-dkms
default_release: buster-backports
state: present
-- name: install zfs-dkms (bullseye and beyond)
+ - name: install zfs file system utilities
+ apt:
+ name: zfsutils-linux
+ default_release: buster-backports
+ state: present
+
+- name: install zfs-dkms and utilities (bullseye and beyond)
when: (ansible_distribution_major_version | int) > 10
- apt:
- name: zfs-dkms
- state: present
+ block:
+ - name: install zfs modules via dkms
+ apt:
+ name: zfs-dkms
+ state: present
+
+ - name: install zfs file system utilities
+ apt:
+ name: zfsutils-linux
+ state: present
- name: check if module is available for the currently running kernel
command: modprobe --dry-run zfs
diff --git a/roles/zfs/base/tasks/Ubuntu.yml b/roles/zfs/base/tasks/Ubuntu.yml
index 0ce85358..d45c30e4 100644
--- a/roles/zfs/base/tasks/Ubuntu.yml
+++ b/roles/zfs/base/tasks/Ubuntu.yml
@@ -1,2 +1,5 @@
---
-# Nothing to do here.
+- name: install zfs file system utilities
+ apt:
+ name: zfsutils-linux
+ state: present
diff --git a/roles/zfs/base/tasks/main.yml b/roles/zfs/base/tasks/main.yml
index e6f2347b..ec1b04bf 100644
--- a/roles/zfs/base/tasks/main.yml
+++ b/roles/zfs/base/tasks/main.yml
@@ -7,7 +7,7 @@
options zfs zfs_arc_max={{ zfs_arc_size.max }}
dest: /etc/modprobe.d/zfs.conf
-- name: install zfs modules
+- name: install zfs modules and utilities
include_tasks: "{{ ansible_distribution }}.yml"
- name: load zfs kernel module
@@ -15,11 +15,6 @@
name: zfs
state: present
-- name: install zfs file system utilities
- apt:
- name: zfsutils-linux
- state: present
-
- name: create zpools
loop: "{{ zfs_zpools | dict2items }}"
loop_control: