From 21d24f7e692a8a9353ba3439bd545294d7c40d32 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 15 Feb 2023 15:27:16 -0500 Subject: [PATCH] Add host variable dnf_automatic_type to influence dnf-automatic-install mode Set it to "security" for status quo ante for most hosts, and "default" for debuginfod* hosts. --- inventory/group_vars/all | 4 ++++ inventory/host_vars/debuginfod01.iad2.fedoraproject.org | 1 + inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org | 1 + roles/dnf-automatic/templates/automatic.conf.j2 | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index e70a21b2ea..f093bccc47 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -272,3 +272,7 @@ wildcard_key_file: wildcard-2023.fedoraproject.org.key wsgi_wants_apache: true # set no x-forward header by default x_forward: false +# +# dnf-automatic-install.service mode default: security-only +dnf_automatic_type: security + diff --git a/inventory/host_vars/debuginfod01.iad2.fedoraproject.org b/inventory/host_vars/debuginfod01.iad2.fedoraproject.org index 89fb0e7c40..66895ee84f 100644 --- a/inventory/host_vars/debuginfod01.iad2.fedoraproject.org +++ b/inventory/host_vars/debuginfod01.iad2.fedoraproject.org @@ -8,3 +8,4 @@ sar_script_user: root virt_install_command: "{{ virt_install_command_one_nic }}" vmhost: vmhost-x86-06.iad2.fedoraproject.org volgroup: /dev/vg_guests +dnf_automatic_type: default diff --git a/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org b/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org index 46f408effd..0a3439862b 100644 --- a/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org @@ -6,3 +6,4 @@ ks_repo: http://10.3.163.35/pub/fedora/linux/releases/36/Server/x86_64/os/ ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora vmhost: vmhost-x86-08.stg.iad2.fedoraproject.org volgroup: /dev/vg_guests +dnf_automatic_type: default diff --git a/roles/dnf-automatic/templates/automatic.conf.j2 b/roles/dnf-automatic/templates/automatic.conf.j2 index 168edac47c..47bc86445d 100644 --- a/roles/dnf-automatic/templates/automatic.conf.j2 +++ b/roles/dnf-automatic/templates/automatic.conf.j2 @@ -2,7 +2,7 @@ # What kind of upgrade to perform: # default = all available upgrades # security = only the security upgrades -upgrade_type = security +upgrade_type = {{ dnf_automatic_type }} random_sleep = 300 # Whether updates should be downloaded when they are available.