summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2024-03-13 14:32:20 +0100
committerChristian Pointner <equinox@spreadspace.org>2024-03-13 14:32:20 +0100
commit35660bfd47f633cf1271badb693ab72eddcf6b76 (patch)
treeb09b9d8090a9208e80479ffc15127b4c84e2c552 /roles
parentremove debug output (diff)
zfs: make zfs-from-backports configurable
Diffstat (limited to 'roles')
-rw-r--r--roles/storage/zfs/base/defaults/main.yml2
-rw-r--r--roles/storage/zfs/base/tasks/Debian.yml10
2 files changed, 7 insertions, 5 deletions
diff --git a/roles/storage/zfs/base/defaults/main.yml b/roles/storage/zfs/base/defaults/main.yml
index 80e4803d..672c0f21 100644
--- a/roles/storage/zfs/base/defaults/main.yml
+++ b/roles/storage/zfs/base/defaults/main.yml
@@ -1,4 +1,6 @@
---
+zfs_from_backports: no
+
zfs_use_systemd_mount_generator: yes
#zfs_arc_size:
# min: 512MB
diff --git a/roles/storage/zfs/base/tasks/Debian.yml b/roles/storage/zfs/base/tasks/Debian.yml
index a1ed0387..c9ac3c76 100644
--- a/roles/storage/zfs/base/tasks/Debian.yml
+++ b/roles/storage/zfs/base/tasks/Debian.yml
@@ -10,20 +10,20 @@
- apt_repo_components is defined
- "'contrib' in apt_repo_components"
-- name: enable backports and force ZFS packages from backports for buster
- when: (ansible_distribution_major_version | int) == 10
+- name: enable backports and force ZFS packages from backports
+ when: zfs_from_backports
block:
- name: add backports repo
include_role:
name: apt-repo/backports
- - name: pin zfs packages to buster-backports
+ - name: pin zfs packages to backports
copy:
content: |
Package: libnvpair1linux libuutil1linux libzfs2linux libzpool2linux spl-dkms zfs-dkms zfs-test zfsutils-linux zfsutils-linux-dev zfs-zed
- Pin: release n=buster-backports
+ Pin: release n={{ ansible_distribution_release }}-backports
Pin-Priority: 990
- dest: /etc/apt/preferences.d/zfs-from-buster-backports
+ dest: /etc/apt/preferences.d/zfs-from-backports
- name: install zfs modules via dkms
apt: