From 210ae8dd2ebae078a930e941d420a78b6b84c647 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 1 Jul 2021 18:19:24 +0200 Subject: [PATCH] bundles/zfs: debian bullseye does not need zfs from backports --- bundles/zfs/metadata.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py index aaec7f6..636aabe 100644 --- a/bundles/zfs/metadata.py +++ b/bundles/zfs/metadata.py @@ -33,14 +33,6 @@ defaults = { }, }, }, - 'repos': { - 'backports': { - 'install_gpg_key': False, # default debian signing key - 'items': { - 'deb http://deb.debian.org/debian {os_release}-backports main', - }, - }, - }, }, 'cron': { 'zfs-auto-snapshot-daily': '0 0 * * * root /usr/local/sbin/zfs-auto-snapshot daily', @@ -78,6 +70,16 @@ defaults = { }, } +if node.os == 'debian' and node.os_version[0] <= 10: + defaults['apt']['repos'] = { + 'backports': { + 'install_gpg_key': False, # default debian signing key + 'items': { + 'deb http://deb.debian.org/debian {os_release}-backports main', + }, + }, + } + if node.has_bundle('telegraf'): defaults['telegraf'] = { 'input_plugins': { @@ -100,7 +102,6 @@ if node.has_bundle('telegraf'): } - @metadata_reactor.provides( 'cron/zfs-scrub', )