From f868afcd302f325b86633f543bd5127aedaa756a Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 21:28:43 -0500 Subject: [PATCH] Ansible core 2.20 fixes Signed-off-by: Jason Rothstein --- tasks/main.yml | 40 +++++++++++++++++++------------------- vars/Fedora-23-default.yml | 4 +++- vars/Fedora-24-default.yml | 4 +++- vars/Fedora-25-default.yml | 4 +++- vars/Fedora-26-default.yml | 4 +++- vars/Fedora-27-default.yml | 4 +++- vars/Fedora-28-default.yml | 4 +++- vars/Fedora-29-default.yml | 4 +++- vars/Fedora-30-default.yml | 4 +++- vars/Fedora-31-default.yml | 4 +++- vars/Fedora-32-default.yml | 4 +++- vars/Fedora-33-default.yml | 4 +++- vars/Fedora-34-default.yml | 2 ++ vars/Fedora-35-default.yml | 2 ++ vars/Fedora-36-default.yml | 2 ++ vars/Fedora-37-default.yml | 2 ++ vars/Fedora-38-default.yml | 2 ++ vars/Fedora-39-default.yml | 2 ++ vars/Fedora-40-default.yml | 2 ++ vars/Fedora-41-default.yml | 2 ++ 20 files changed, 69 insertions(+), 31 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 026f9c8..34d569f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,36 +2,36 @@ # tasks file for ensure_os_upgrade - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_os_upgrade' vars: findme: files: - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_distribution }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_os_family }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-default.yml' - 'default.yml' paths: - '../vars/' errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - packages is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - services is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_os_upgrade is defined - ensure_os_upgrade.package_list is defined - ensure_os_upgrade.package_list is iterable @@ -46,7 +46,7 @@ - 'ensure_os_upgrade.service_facts' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_os_upgrade is defined - ensure_os_upgrade.service_list is defined - ensure_os_upgrade.service_list is iterable @@ -62,37 +62,37 @@ - 'ensure_os_upgrade.service_facts' - name: 'Ensure system-upgrade download' when: - - ansible_system == 'Linux' - - ansible_distribution == 'Fedora' + - ansible_facts["system"] == 'Linux' + - ansible_facts["distribution"] == 'Fedora' - ensure_os_upgrade is defined - ensure_os_upgrade.package_list is defined - ensure_os_upgrade.package_list is iterable - ensure_os_upgrade.target_version is defined - - ansible_distribution_major_version|int < ensure_os_upgrade.target_version|int + - ansible_facts["distribution_major_version"]|int < ensure_os_upgrade.target_version|int ansible.builtin.shell: > dnf -y system-upgrade download --refresh --releasever={{ ensure_os_upgrade.target_version|int }} - name: 'Ensure system-upgrade reboot' when: - - ansible_system == 'Linux' - - ansible_distribution == 'Fedora' + - ansible_facts["system"] == 'Linux' + - ansible_facts["distribution"] == 'Fedora' - ensure_os_upgrade is defined - ensure_os_upgrade.package_list is defined - ensure_os_upgrade.package_list is iterable - ensure_os_upgrade.target_version is defined - - ansible_distribution_major_version|int < ensure_os_upgrade.target_version|int + - ansible_facts["distribution_major_version"]|int < ensure_os_upgrade.target_version|int async: '1' poll: '0' ansible.builtin.shell: > sleep 5 && dnf -y system-upgrade reboot - name: 'Wait for the reboot' when: - - ansible_system == 'Linux' - - ansible_distribution == 'Fedora' + - ansible_facts["system"] == 'Linux' + - ansible_facts["distribution"] == 'Fedora' - ensure_os_upgrade is defined - ensure_os_upgrade.package_list is defined - ensure_os_upgrade.package_list is iterable - ensure_os_upgrade.target_version is defined - - ansible_distribution_major_version|int < ensure_os_upgrade.target_version|int + - ansible_facts["distribution_major_version"]|int < ensure_os_upgrade.target_version|int ansible.builtin.wait_for: connect_timeout: '5' delay: '300' diff --git a/vars/Fedora-23-default.yml b/vars/Fedora-23-default.yml index cec3855..67a86c5 100644 --- a/vars/Fedora-23-default.yml +++ b/vars/Fedora-23-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '24' \ No newline at end of file +target_version: '24' +... + diff --git a/vars/Fedora-24-default.yml b/vars/Fedora-24-default.yml index 515d8c4..ef09772 100644 --- a/vars/Fedora-24-default.yml +++ b/vars/Fedora-24-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '25' \ No newline at end of file +target_version: '25' +... + diff --git a/vars/Fedora-25-default.yml b/vars/Fedora-25-default.yml index aa3c3c6..bb21b98 100644 --- a/vars/Fedora-25-default.yml +++ b/vars/Fedora-25-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '26' \ No newline at end of file +target_version: '26' +... + diff --git a/vars/Fedora-26-default.yml b/vars/Fedora-26-default.yml index 7d6232b..640c176 100644 --- a/vars/Fedora-26-default.yml +++ b/vars/Fedora-26-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '27' \ No newline at end of file +target_version: '27' +... + diff --git a/vars/Fedora-27-default.yml b/vars/Fedora-27-default.yml index 9d43aa3..a22caa9 100644 --- a/vars/Fedora-27-default.yml +++ b/vars/Fedora-27-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '28' \ No newline at end of file +target_version: '28' +... + diff --git a/vars/Fedora-28-default.yml b/vars/Fedora-28-default.yml index 925ad30..f56c8dc 100644 --- a/vars/Fedora-28-default.yml +++ b/vars/Fedora-28-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '29' \ No newline at end of file +target_version: '29' +... + diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml index fddaa43..30f5b0b 100644 --- a/vars/Fedora-29-default.yml +++ b/vars/Fedora-29-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '30' \ No newline at end of file +target_version: '30' +... + diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml index aae65e0..ca5c1f5 100644 --- a/vars/Fedora-30-default.yml +++ b/vars/Fedora-30-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '31' \ No newline at end of file +target_version: '31' +... + diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml index 8755957..010d3a8 100644 --- a/vars/Fedora-31-default.yml +++ b/vars/Fedora-31-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '32' \ No newline at end of file +target_version: '32' +... + diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml index 1b92c1f..c6a6339 100644 --- a/vars/Fedora-32-default.yml +++ b/vars/Fedora-32-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '33' \ No newline at end of file +target_version: '33' +... + diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml index d66ae5d..3df841d 100644 --- a/vars/Fedora-33-default.yml +++ b/vars/Fedora-33-default.yml @@ -3,4 +3,6 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' -target_version: '34' \ No newline at end of file +target_version: '34' +... + diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml index 61f1a40..2e2e6ec 100644 --- a/vars/Fedora-34-default.yml +++ b/vars/Fedora-34-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '35' +... + diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml index f4dcf78..9c29e23 100644 --- a/vars/Fedora-35-default.yml +++ b/vars/Fedora-35-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '36' +... + diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml index 4201534..80053f4 100644 --- a/vars/Fedora-36-default.yml +++ b/vars/Fedora-36-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '37' +... + diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml index 4e1f436..c53b215 100644 --- a/vars/Fedora-37-default.yml +++ b/vars/Fedora-37-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '38' +... + diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml index 66324fa..31b1c1a 100644 --- a/vars/Fedora-38-default.yml +++ b/vars/Fedora-38-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '39' +... + diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml index 0d26389..ae00741 100644 --- a/vars/Fedora-39-default.yml +++ b/vars/Fedora-39-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '40' +... + diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml index 1555c62..dceeb07 100644 --- a/vars/Fedora-40-default.yml +++ b/vars/Fedora-40-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '41' +... + diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml index 040aa25..e0fbbfb 100644 --- a/vars/Fedora-41-default.yml +++ b/vars/Fedora-41-default.yml @@ -4,3 +4,5 @@ package_list: - name: 'dnf-plugin-system-upgrade' state: 'present' target_version: '42' +... +