From 372f8455097809504ef3653b6893d4af794f7608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Mon, 13 Sep 2021 10:26:36 +0200 Subject: [PATCH] default: Set list to empty instead of None The `eol_opsys` variable should be set explicitly to the empty list rather than the implicitly `None` otherwise it causes problems down the line. --- inventory/host_vars/retrace-stg.aws.fedoraproject.org | 5 +++-- inventory/host_vars/retrace03.rdu-cc.fedoraproject.org | 5 +++-- roles/abrt/faf/defaults/main.yml | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/inventory/host_vars/retrace-stg.aws.fedoraproject.org b/inventory/host_vars/retrace-stg.aws.fedoraproject.org index d55126ced5..592ad80da6 100644 --- a/inventory/host_vars/retrace-stg.aws.fedoraproject.org +++ b/inventory/host_vars/retrace-stg.aws.fedoraproject.org @@ -24,8 +24,9 @@ faf_opsys_list: - centos # Clean-up packages of following EOLed operating systems -eol_opsys: -# - { opsys: "Fedora", release: "30"} +eol_opsys: [] +# When not empty, the array should have the following form: +# - { opsys: "Fedora", release: "36" } # GDPR SAR variables sar_script: '/usr/bin/faf sar' diff --git a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org index 69829e4c3f..b5c9283f17 100644 --- a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org @@ -35,8 +35,9 @@ faf_opsys_list: - centos # Clean-up packages of following EOLed operating systems -eol_opsys: -# - { opsys: "Fedora", release: "32"} +eol_opsys: [] +# When not empty, the array should have the following form: +# - { opsys: "Fedora", release: "36" } # GDPR SAR variables sar_script: '/usr/bin/faf sar' diff --git a/roles/abrt/faf/defaults/main.yml b/roles/abrt/faf/defaults/main.yml index 995c324f03..8c1af26c36 100644 --- a/roles/abrt/faf/defaults/main.yml +++ b/roles/abrt/faf/defaults/main.yml @@ -240,5 +240,6 @@ faf_web_symboltransfer_packages: # EOLed Opsys # ############### -eol_opsys: - - { opsys: "", release: "" } +eol_opsys: [] +# When not empty, the array should have the following form: +# - { opsys: "Fedora", release: "36" }