From d61baa9cd605297aa3e0e5e5a25ed1a25d95bbbd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 27 Nov 2025 22:12:14 -0600
Subject: [PATCH] Attempt to fix ansible_facts deprecation warnings.

---
 molecule/default/calico.yml   | 6 +++---
 molecule/default/converge.yml | 6 +++---
 tasks/main.yml                | 6 +++---
 tasks/sysctl-setup.yml        | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/molecule/default/calico.yml b/molecule/default/calico.yml
index c20243d..cd6f81d 100644
--- a/molecule/default/calico.yml
+++ b/molecule/default/calico.yml
@@ -19,15 +19,15 @@
   pre_tasks:
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
+      when: ansible_facts.os_family == 'Debian'
 
     - name: Ensure test dependencies are installed (RedHat).
       package: name=iproute state=present
-      when: ansible_os_family == 'RedHat'
+      when: ansible_facts.os_family == 'RedHat'
 
     - name: Ensure test dependencies are installed (Debian).
       package: name=iproute2 state=present
-      when: ansible_os_family == 'Debian'
+      when: ansible_facts.os_family == 'Debian'
 
     - name: Gather facts.
       action: setup
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 19352c4..9304e6c 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -15,15 +15,15 @@
   pre_tasks:
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
+      when: ansible_facts.os_family == 'Debian'
 
     - name: Ensure test dependencies are installed (RedHat).
       package: name=iproute state=present
-      when: ansible_os_family == 'RedHat'
+      when: ansible_facts.os_family == 'RedHat'
 
     - name: Ensure test dependencies are installed (Debian).
       package: name=iproute2 state=present
-      when: ansible_os_family == 'Debian'
+      when: ansible_facts.os_family == 'Debian'
 
     - name: Gather facts.
       action: setup
diff --git a/tasks/main.yml b/tasks/main.yml
index 1357968..65f4d00 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ ansible_facts.os_family }}.yml"
 
 - include_tasks: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_facts.os_family == 'RedHat'
 
 - include_tasks: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
+  when: ansible_facts.os_family == 'Debian'
 
 - name: Install Kubernetes packages.
   package:
diff --git a/tasks/sysctl-setup.yml b/tasks/sysctl-setup.yml
index dc1a49f..86181f3 100644
--- a/tasks/sysctl-setup.yml
+++ b/tasks/sysctl-setup.yml
@@ -4,8 +4,8 @@
     name: "{{ procps_package }}"
     state: present
   when: >
-    ansible_distribution != 'Debian'
-    or ansible_distribution_major_version | int < 10
+    ansible_facts.distribution != 'Debian'
+    or ansible_facts.distribution_major_version | int < 10
 
 - name: Ensure module br_netfilter is loaded
   modprobe:
@@ -24,6 +24,6 @@
     - net.bridge.bridge-nf-call-iptables
     - net.bridge.bridge-nf-call-ip6tables
   when: >
-    ( ansible_distribution != 'Debian'
-      or ansible_distribution_major_version | int < 10
+    ( ansible_facts.distribution != 'Debian'
+      or ansible_facts.distribution_major_version | int < 10
     ) and not ansible_virtualization_type == "docker"