From c48179e9d2318520b120759cd3037dfc2d756739 Mon Sep 17 00:00:00 2001
From: AnsibleRoles <>
Date: Sun, 28 Mar 2021 04:03:44 +0000
Subject: [PATCH 01/33] Initial commit

---
 .gitignore | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md  |  2 ++
 2 files changed, 99 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7a6ae95
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,97 @@
+# ---> Ansible
+*.retry
+
+# ---> Windows
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# ---> Linux
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# ---> macOS
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon

+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# ---> Vim
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d6b31a6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# ensure_os_upgrade
+

From 057bf4bf2e434f268dec1663463b94a12628fc84 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 27 Mar 2021 23:07:49 -0500
Subject: [PATCH 02/33] Initial Ansible Role

---
 README.md | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6b31a6..225dd44 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,38 @@
-# ensure_os_upgrade
+Role Name
+=========
 
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).

From df3d243d8fec3b0c132291e07f3c779680607145 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 27 Mar 2021 23:08:41 -0500
Subject: [PATCH 03/33] Initial Ansible Role

---
 .travis.yml       | 29 ++++++++++++++++++++++++++
 defaults/main.yml |  2 ++
 handlers/main.yml |  2 ++
 meta/main.yml     | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 tasks/main.yml    |  2 ++
 tests/inventory   |  2 ++
 tests/test.yml    |  5 +++++
 vars/main.yml     |  2 ++
 8 files changed, 97 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 defaults/main.yml
 create mode 100644 handlers/main.yml
 create mode 100644 meta/main.yml
 create mode 100644 tasks/main.yml
 create mode 100644 tests/inventory
 create mode 100644 tests/test.yml
 create mode 100644 vars/main.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..36bbf62
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' >ansible.cfg
+
+script:
+  # Basic role syntax check
+  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..44a0374
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for ensure_os_upgrade
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..d7140f4
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for ensure_os_upgrade
\ No newline at end of file
diff --git a/meta/main.yml b/meta/main.yml
new file mode 100644
index 0000000..227ad9c
--- /dev/null
+++ b/meta/main.yml
@@ -0,0 +1,53 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.9
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
+  
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
new file mode 100644
index 0000000..14ce16c
--- /dev/null
+++ b/tasks/main.yml
@@ -0,0 +1,2 @@
+---
+# tasks file for ensure_os_upgrade
\ No newline at end of file
diff --git a/tests/inventory b/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/tests/test.yml b/tests/test.yml
new file mode 100644
index 0000000..560d3e0
--- /dev/null
+++ b/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ensure_os_upgrade
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
new file mode 100644
index 0000000..d632f23
--- /dev/null
+++ b/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for ensure_os_upgrade
\ No newline at end of file

From dffd55bc446cf615d1320252783214f1ffb75e5f Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:10:14 +0000
Subject: [PATCH 04/33] Set the default target Fedora to upgrade to

---
 defaults/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 44a0374..99ec6d1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
-# defaults file for ensure_os_upgrade
\ No newline at end of file
+# defaults file for ensure_os_upgrade
+target_fedora_release: '32'
\ No newline at end of file

From 08d1e4f3cd585e69607a1c42692d196142cd159e Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:11:57 +0000
Subject: [PATCH 05/33] Setup default handlers to gather facts

---
 handlers/main.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index d7140f4..659d0f5 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,6 @@
 ---
-# handlers file for ensure_os_upgrade
\ No newline at end of file
+# handlers file for ensure_os_upgrade
+- name: 'ensure_os_upgrade.package_facts'
+  ansible.builtin.package_facts:
+- name: 'ensure_os_upgrade.service_facts'
+  ansible.builtin.service_facts:
\ No newline at end of file

From 3059a0ec23a804e433d1b28f5eba9db299166f4a Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:16:53 +0000
Subject: [PATCH 06/33] Define basic role feature

---
 tasks/main.yml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 14ce16c..ad391dc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,2 +1,68 @@
 ---
-# tasks file for ensure_os_upgrade
\ No newline at end of file
+# tasks file for ensure_os_upgrade
+- name: 'include variables'
+  when:
+    - ansible_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'
+        - 'default.yml'
+      paths:
+        - '../vars/'
+      errors: 'ignore'
+- name: 'package discovery'
+  when:
+    - ansible_system == 'Linux'
+    - packages is not defined
+  ansible.builtin.package_facts:
+- name: 'service discovery'
+  when:
+    - ansible_system == 'Linux'
+    - services is not defined
+  ansible.builtin.service_facts:
+  - name: 'ensure packages'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_os_upgrade is defined
+    - ensure_os_upgrade.package_list is defined
+    - ensure_os_upgrade.package_list is iterable
+    - packages[item.name] is not defined
+  ansible.builtin.package:
+    name: '{{ item.name }}'
+    state: '{{ item.state }}'
+  loop: '{{ ensure_os_upgrade.package_list }}'
+  loop_control:
+    label: '{{ item.name }} will be {{ item.state }}'
+  notify:
+    - 'ensure_os_upgrade.package_facts'
+    - 'ensure_os_upgrade.service_facts'
+- name: 'ensure services'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_os_upgrade is defined
+    - ensure_os_upgrade.service_list is defined
+    - ensure_os_upgrade.service_list is iterable
+  ansible.builtin.service:
+    enabled: '{{ item.enabled }}'
+    name: '{{ item.name }}'
+    state: '{{ item.state }}'
+  loop: '{{ ensure_os_upgrade.service_list }}'
+  loop_control:
+    label: '{{ item.name }} will be {{ item.state }}'
+  notify:
+    - 'ensure_os_upgrade.package_facts'
+    - 'ensure_os_upgrade.service_facts'
+
+
+
+- name: 'flush handlers'
+  meta: 'flush_handlers'
\ No newline at end of file

From a6c22bd92025dab315f29f2bf8e8503c0e9e9c90 Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:26:13 +0000
Subject: [PATCH 07/33] Add default OS/Vendor config of do nothing

---
 vars/default.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vars/default.yml

diff --git a/vars/default.yml b/vars/default.yml
new file mode 100644
index 0000000..d632f23
--- /dev/null
+++ b/vars/default.yml
@@ -0,0 +1,2 @@
+---
+# vars file for ensure_os_upgrade
\ No newline at end of file

From 16494c44cfffd9bf460f4c924e6bfed970f9aa9d Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:28:03 +0000
Subject: [PATCH 08/33] Enable Fedora 32 to upgrade

---
 vars/Fedora-32-default.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 vars/Fedora-32-default.yml

diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml
new file mode 100644
index 0000000..77275f2
--- /dev/null
+++ b/vars/Fedora-32-default.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
\ No newline at end of file

From 25d554da9af478e11d8e4e4ddf7fb8e9ee23041b Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:29:15 +0000
Subject: [PATCH 09/33] Enable Fedora 31 to upgrade

---
 vars/Fedora-31-default.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 vars/Fedora-31-default.yml

diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml
new file mode 100644
index 0000000..77275f2
--- /dev/null
+++ b/vars/Fedora-31-default.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
\ No newline at end of file

From be0534542940e83420670551e1f36cbaab38e186 Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:29:37 +0000
Subject: [PATCH 10/33] Enable Fedora 30 to upgrade

---
 vars/Fedora-30-default.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 vars/Fedora-30-default.yml

diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml
new file mode 100644
index 0000000..77275f2
--- /dev/null
+++ b/vars/Fedora-30-default.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
\ No newline at end of file

From 5c5594be6ee46461efb51401a449a8150bb7fc43 Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:38:25 +0000
Subject: [PATCH 11/33] If we know how to upgrade Fedora via DNF... do it.

---
 tasks/main.yml | 51 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index ad391dc..a585468 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -61,8 +61,53 @@
   notify:
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
-
-
-
+- name: 'Ensure system-upgrade download'
+  when:
+    - ansible_system == 'Linux'
+    - ansible_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.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'
+    - 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
+  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'
+    - 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.builtin.wait_for:
+    connect_timeout: '5'
+    delay: '300'
+    host: '{{ (ansible_ssh_host|default(ansible_host))|default(inventory_hostname) }}'
+    port: '22'
+    search_regex: 'OpenSSH'
+    sleep: '15'
+    timeout: '1800'
+  vars:
+    ansible_connection: 'local'
+- name: 'Gather facts'
+  ansible.builtin.setup:
+  notify:
+    - 'ensure_os_upgrade.package_facts'
+    - 'ensure_os_upgrade.service_facts'
 - name: 'flush handlers'
   meta: 'flush_handlers'
\ No newline at end of file

From 36377d91116cefb7a1b0b953a9ac984a53d50ee6 Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:39:05 +0000
Subject: [PATCH 12/33] Remove default targets

---
 defaults/main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 99ec6d1..44a0374 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,2 @@
 ---
-# defaults file for ensure_os_upgrade
-target_fedora_release: '32'
\ No newline at end of file
+# defaults file for ensure_os_upgrade
\ No newline at end of file

From e348c2511912fb5ff8a0f168a9c55a15acc93aca Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:39:34 +0000
Subject: [PATCH 13/33] Ensure Fedora 30 can only upgrade to 31

---
 vars/Fedora-30-default.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/Fedora-30-default.yml b/vars/Fedora-30-default.yml
index 77275f2..aae65e0 100644
--- a/vars/Fedora-30-default.yml
+++ b/vars/Fedora-30-default.yml
@@ -2,4 +2,5 @@
 # vars file for ensure_os_upgrade
 package_list:
   - name: 'dnf-plugin-system-upgrade'
-    state: 'present'
\ No newline at end of file
+    state: 'present'
+target_version: '31'
\ No newline at end of file

From 79f12c739dc1f1584af55f5bbea8ee49555b83a7 Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:39:55 +0000
Subject: [PATCH 14/33] Ensure Fedora 31 can only upgrade to 32

---
 vars/Fedora-31-default.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/Fedora-31-default.yml b/vars/Fedora-31-default.yml
index 77275f2..8755957 100644
--- a/vars/Fedora-31-default.yml
+++ b/vars/Fedora-31-default.yml
@@ -2,4 +2,5 @@
 # vars file for ensure_os_upgrade
 package_list:
   - name: 'dnf-plugin-system-upgrade'
-    state: 'present'
\ No newline at end of file
+    state: 'present'
+target_version: '32'
\ No newline at end of file

From 7fae75d1e372ccd79270c1fa684e2964abb0cb7f Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:40:15 +0000
Subject: [PATCH 15/33] Ensure Fedora 32 can only upgrade to 33

---
 vars/Fedora-32-default.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/Fedora-32-default.yml b/vars/Fedora-32-default.yml
index 77275f2..1b92c1f 100644
--- a/vars/Fedora-32-default.yml
+++ b/vars/Fedora-32-default.yml
@@ -2,4 +2,5 @@
 # vars file for ensure_os_upgrade
 package_list:
   - name: 'dnf-plugin-system-upgrade'
-    state: 'present'
\ No newline at end of file
+    state: 'present'
+target_version: '33'
\ No newline at end of file

From 4cc4d6c0f6f6ca2831803922d7f13efe898bcfea Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 04:43:40 +0000
Subject: [PATCH 16/33] Fix indentation syntax error

---
 tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index a585468..e539502 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,7 +29,7 @@
     - ansible_system == 'Linux'
     - services is not defined
   ansible.builtin.service_facts:
-  - name: 'ensure packages'
+- name: 'ensure packages'
   when:
     - ansible_system == 'Linux'
     - ensure_os_upgrade is defined

From 5f430875adca2f0000ca25f9439fd7bd5ed1887d Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 27 Mar 2021 23:58:14 -0500
Subject: [PATCH 17/33] Enable Fedora 23-29 to upgrade via DNF

---
 vars/Fedora-23-default.yml | 6 ++++++
 vars/Fedora-24-default.yml | 6 ++++++
 vars/Fedora-25-default.yml | 6 ++++++
 vars/Fedora-26-default.yml | 6 ++++++
 vars/Fedora-27-default.yml | 6 ++++++
 vars/Fedora-28-default.yml | 6 ++++++
 vars/Fedora-29-default.yml | 6 ++++++
 7 files changed, 42 insertions(+)
 create mode 100644 vars/Fedora-23-default.yml
 create mode 100644 vars/Fedora-24-default.yml
 create mode 100644 vars/Fedora-25-default.yml
 create mode 100644 vars/Fedora-26-default.yml
 create mode 100644 vars/Fedora-27-default.yml
 create mode 100644 vars/Fedora-28-default.yml
 create mode 100644 vars/Fedora-29-default.yml

diff --git a/vars/Fedora-23-default.yml b/vars/Fedora-23-default.yml
new file mode 100644
index 0000000..cec3855
--- /dev/null
+++ b/vars/Fedora-23-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '24'
\ No newline at end of file
diff --git a/vars/Fedora-24-default.yml b/vars/Fedora-24-default.yml
new file mode 100644
index 0000000..515d8c4
--- /dev/null
+++ b/vars/Fedora-24-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '25'
\ No newline at end of file
diff --git a/vars/Fedora-25-default.yml b/vars/Fedora-25-default.yml
new file mode 100644
index 0000000..aa3c3c6
--- /dev/null
+++ b/vars/Fedora-25-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '26'
\ No newline at end of file
diff --git a/vars/Fedora-26-default.yml b/vars/Fedora-26-default.yml
new file mode 100644
index 0000000..7d6232b
--- /dev/null
+++ b/vars/Fedora-26-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '27'
\ No newline at end of file
diff --git a/vars/Fedora-27-default.yml b/vars/Fedora-27-default.yml
new file mode 100644
index 0000000..9d43aa3
--- /dev/null
+++ b/vars/Fedora-27-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '28'
\ No newline at end of file
diff --git a/vars/Fedora-28-default.yml b/vars/Fedora-28-default.yml
new file mode 100644
index 0000000..925ad30
--- /dev/null
+++ b/vars/Fedora-28-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '29'
\ No newline at end of file
diff --git a/vars/Fedora-29-default.yml b/vars/Fedora-29-default.yml
new file mode 100644
index 0000000..fddaa43
--- /dev/null
+++ b/vars/Fedora-29-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '30'
\ No newline at end of file

From 2318c37337a6ec938cc25d73fde1fa6ccc93e16d Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 05:02:16 +0000
Subject: [PATCH 18/33] Disable warnings on dnf system-upgrade plugin calls

---
 tasks/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index e539502..3a56346 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -70,6 +70,7 @@
     - 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
+  warn: 'false'
   ansible.builtin.shell: >
     dnf -y system-upgrade download --refresh --releasever={{ ensure_os_upgrade.target_version|int }}
 - name: 'Ensure system-upgrade reboot'
@@ -83,6 +84,7 @@
     - ansible_distribution_major_version|int < ensure_os_upgrade.target_version|int
   async: '1'
   poll: '0'
+  warn: 'false'
   ansible.builtin.shell: >
     sleep 5 && dnf -y system-upgrade reboot
 - name: 'Wait for the reboot'

From 1e9f2eb11252a4aea0c126458eab2337f1c212d6 Mon Sep 17 00:00:00 2001
From: jmrothst <fdragon@fdragon.org>
Date: Sun, 28 Mar 2021 05:24:30 +0000
Subject: [PATCH 19/33] Remove warn because ansible cannot handle both a warn
 and ansible.builting.shell ?!

---
 tasks/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 3a56346..e539502 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -70,7 +70,6 @@
     - 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
-  warn: 'false'
   ansible.builtin.shell: >
     dnf -y system-upgrade download --refresh --releasever={{ ensure_os_upgrade.target_version|int }}
 - name: 'Ensure system-upgrade reboot'
@@ -84,7 +83,6 @@
     - ansible_distribution_major_version|int < ensure_os_upgrade.target_version|int
   async: '1'
   poll: '0'
-  warn: 'false'
   ansible.builtin.shell: >
     sleep 5 && dnf -y system-upgrade reboot
 - name: 'Wait for the reboot'

From 173cff470fe96472501f692ec39b813fab95eb85 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 14 Jun 2021 22:37:03 -0500
Subject: [PATCH 20/33] Enable Fedora 33 upgrades to 34

---
 vars/Fedora-33-default.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 vars/Fedora-33-default.yml

diff --git a/vars/Fedora-33-default.yml b/vars/Fedora-33-default.yml
new file mode 100644
index 0000000..d66ae5d
--- /dev/null
+++ b/vars/Fedora-33-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '34'
\ No newline at end of file

From 4a5414789306d017a36e09de3618afc603731786 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 25 Jul 2021 03:26:39 +0000
Subject: [PATCH 21/33] Add some flushing of handlers

---
 tasks/main.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index e539502..84ffdd1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -45,6 +45,8 @@
   notify:
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
+- name: 'flush handlers'
+  meta: 'flush_handlers'
 - name: 'ensure services'
   when:
     - ansible_system == 'Linux'
@@ -61,6 +63,8 @@
   notify:
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
+- name: 'flush handlers'
+  meta: 'flush_handlers'
 - name: 'Ensure system-upgrade download'
   when:
     - ansible_system == 'Linux'
@@ -110,4 +114,4 @@
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
\ No newline at end of file
+  meta: 'flush_handlers'

From 492b3ceaf9a521f4b528fa5258c7cda946ea6e97 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 25 Jul 2021 03:52:24 +0000
Subject: [PATCH 22/33] Prevent multiple service restarts

---
 tasks/main.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 84ffdd1..6f92dd9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -45,8 +45,6 @@
   notify:
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
-- name: 'flush handlers'
-  meta: 'flush_handlers'
 - name: 'ensure services'
   when:
     - ansible_system == 'Linux'
@@ -63,8 +61,6 @@
   notify:
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
-- name: 'flush handlers'
-  meta: 'flush_handlers'
 - name: 'Ensure system-upgrade download'
   when:
     - ansible_system == 'Linux'
@@ -115,3 +111,4 @@
     - 'ensure_os_upgrade.service_facts'
 - name: 'flush handlers'
   meta: 'flush_handlers'
+

From 67c740b417d9191da5f2c9d326b90d4b4c7b0c2f Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 5 Jun 2022 16:29:45 -0500
Subject: [PATCH 23/33] Update handlers

---
 handlers/main.yml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 659d0f5..4114067 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -3,4 +3,25 @@
 - name: 'ensure_os_upgrade.package_facts'
   ansible.builtin.package_facts:
 - name: 'ensure_os_upgrade.service_facts'
-  ansible.builtin.service_facts:
\ No newline at end of file
+  ansible.builtin.service_facts:
+- name: 'ensure_os_upgrade.service_reload'
+  when:
+    - ansible_system == 'Linux'
+    - ansible_service_mgr == 'systemd'
+    - ensure_os_upgrade is defined
+  ansible.builtin.systemd:
+    daemon_reload: 'yes'
+- name: 'ensure_os_upgrade.services'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_os_upgrade is defined
+    - ensure_os_upgrade.service_list is defined
+    - ensure_os_upgrade.service_list is iterable
+    - item.state == 'started'
+  ansible.builtin.service:
+    enabled: '{{ item.enabled }}'
+    name: '{{ item.name }}'
+    state: 'restarted'
+  loop: '{{ ensure_os_upgrade.service_list }}'
+  loop_control:
+    label: '{{ item.name }} will be restarted'

From 3e2777ae6abcbeea4612237c8b7a46ce7cba943f Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 5 Jun 2022 16:48:11 -0500
Subject: [PATCH 24/33] Update tasks

---
 tasks/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 6f92dd9..b279035 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -35,7 +35,6 @@
     - ensure_os_upgrade is defined
     - ensure_os_upgrade.package_list is defined
     - ensure_os_upgrade.package_list is iterable
-    - packages[item.name] is not defined
   ansible.builtin.package:
     name: '{{ item.name }}'
     state: '{{ item.state }}'

From 378b5cfbfbf52d7f461f485b2d469fefdcae955a Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Tue, 6 Dec 2022 20:38:08 -0600
Subject: [PATCH 25/33] Add Fedora 34/35 upgrade to 35/36

---
 vars/Fedora-34-default.yml | 6 ++++++
 vars/Fedora-35-default.yml | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 vars/Fedora-34-default.yml
 create mode 100644 vars/Fedora-35-default.yml

diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml
new file mode 100644
index 0000000..61f1a40
--- /dev/null
+++ b/vars/Fedora-34-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+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
new file mode 100644
index 0000000..f4dcf78
--- /dev/null
+++ b/vars/Fedora-35-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '36'

From 4f290c7bf518a893759424c9f7490916497d696b Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 29 Apr 2023 20:16:25 -0500
Subject: [PATCH 26/33] Fedora 36 to 37 upgrade

---
 vars/Fedora-36-default.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 vars/Fedora-36-default.yml

diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml
new file mode 100644
index 0000000..4201534
--- /dev/null
+++ b/vars/Fedora-36-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '37'

From 31ad38da59e28d08a06d8f3ee3b01939c5272499 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 29 Apr 2023 20:17:00 -0500
Subject: [PATCH 27/33] Fedora 37 to 38 upgrade

---
 vars/Fedora-37-default.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 vars/Fedora-37-default.yml

diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml
new file mode 100644
index 0000000..4e1f436
--- /dev/null
+++ b/vars/Fedora-37-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '38'

From 22ec1562d21811fba77023733f73c7a8460c0d08 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 16 Mar 2024 21:02:48 -0500
Subject: [PATCH 28/33] Add Fedora 38 to 39

---
 vars/Fedora-38-default.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 vars/Fedora-38-default.yml

diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml
new file mode 100644
index 0000000..66324fa
--- /dev/null
+++ b/vars/Fedora-38-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '39'

From cbbc4a1870740ef88983ddd25833b432ce6433b6 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Wed, 10 Jul 2024 21:51:31 -0500
Subject: [PATCH 29/33] Upgrade to Fedora 40

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 vars/Fedora-39-default.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 vars/Fedora-39-default.yml

diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml
new file mode 100644
index 0000000..0d26389
--- /dev/null
+++ b/vars/Fedora-39-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '40'

From e29c759925efbd34bee4f2b6399429e582cebdf6 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 27 Apr 2025 12:42:09 -0500
Subject: [PATCH 30/33] Fedora 42

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 vars/Fedora-40-default.yml | 6 ++++++
 vars/Fedora-41-default.yml | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 vars/Fedora-40-default.yml
 create mode 100644 vars/Fedora-41-default.yml

diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml
new file mode 100644
index 0000000..1555c62
--- /dev/null
+++ b/vars/Fedora-40-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+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
new file mode 100644
index 0000000..040aa25
--- /dev/null
+++ b/vars/Fedora-41-default.yml
@@ -0,0 +1,6 @@
+---
+# vars file for ensure_os_upgrade
+package_list:
+  - name: 'dnf-plugin-system-upgrade'
+    state: 'present'
+target_version: '42'

From ba18694e6e8bde32dd4f90b2d30b3402486206e0 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 25 May 2025 20:12:07 -0500
Subject: [PATCH 31/33] Hanlder improvements

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 handlers/main.yml | 4 +++-
 tasks/main.yml    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 4114067..b00406b 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -11,7 +11,7 @@
     - ensure_os_upgrade is defined
   ansible.builtin.systemd:
     daemon_reload: 'yes'
-- name: 'ensure_os_upgrade.services'
+- name: 'ensure_os_upgrade.service_restart'
   when:
     - ansible_system == 'Linux'
     - ensure_os_upgrade is defined
@@ -25,3 +25,5 @@
   loop: '{{ ensure_os_upgrade.service_list }}'
   loop_control:
     label: '{{ item.name }} will be restarted'
+...
+
diff --git a/tasks/main.yml b/tasks/main.yml
index b279035..026f9c8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -110,4 +110,5 @@
     - 'ensure_os_upgrade.service_facts'
 - name: 'flush handlers'
   meta: 'flush_handlers'
+...
 

From eac7d9a03773b99cf59eb811044812acf4479300 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 4 May 2026 21:28:43 -0500
Subject: [PATCH 32/33] Ansible core 2.20 fixes

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 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'
+...
+

From e56a0039033222ab73c80f54987733eeab813c33 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 4 May 2026 22:06:46 -0500
Subject: [PATCH 33/33] More ansible core 2.20 fixes

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 tasks/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 34d569f..ca79176 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,12 +22,12 @@
 - name: 'package discovery'
   when:
     - ansible_facts["system"] == 'Linux'
-    - packages is not defined
+    - ansible_facts["packages"] is not defined
   ansible.builtin.package_facts:
 - name: 'service discovery'
   when:
     - ansible_facts["system"] == 'Linux'
-    - services is not defined
+    - ansible_facts["services"] is not defined
   ansible.builtin.service_facts:
 - name: 'ensure packages'
   when: