Ansible core 2.20 fixes

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
This commit is contained in:
2026-05-04 21:28:43 -05:00
parent 2072504793
commit f868afcd30
20 changed files with 69 additions and 31 deletions
+20 -20
View File
@@ -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'