refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead

richm · richm · commit 981954a249b0 · 2026-01-12T18:03:00.000-07:00
Ansible 2.20 has deprecated the use of Ansible facts as variables. For example, `ansible_distribution` is now deprecated in favor of `ansible_facts["distribution"]`. This is due to making the default setting `INJECT_FACTS_AS_VARS=false`. For now, this will create WARNING messages, but in Ansible 2.24 it will be an error. See https://docs.ansible.com/projects/ansible/latest/porting_guides/porting_guide_core_2.20.html#inject-facts-as-vars Signed-off-by: Rich Megginson <rmeggins@redhat.com>
diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml
@@ -44,6 +44,7 @@ jobs:
 
     env:
       TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi"
+      ANSIBLE_INJECT_FACT_VARS: "false"
 
     steps:
       - name: Checkout repo
diff --git a/.github/workflows/tft.yml b/.github/workflows/tft.yml
@@ -168,6 +168,7 @@ jobs:
             SR_ARTIFACTS_DIR=${{ steps.set_vars.outputs.ARTIFACTS_DIR }};\
             SR_TEST_LOCAL_CHANGES=false;\
             SR_LSR_USER=${{ vars.SR_LSR_USER }};\
+            SR_ANSIBLE_INJECT_FACT_VARS=false;\
             SR_ARTIFACTS_URL=${{ steps.set_vars.outputs.ARTIFACTS_URL }}"
           # Note that LINUXSYSTEMROLES_SSH_KEY must be single-line, TF doesn't read multi-line variables fine.
           secrets: "SR_LSR_DOMAIN=${{ secrets.SR_LSR_DOMAIN }};\
diff --git a/README-ostree.md b/README-ostree.md
@@ -20,8 +20,8 @@ Usage:
 .ostree/get_ostree_data.sh packages runtime DISTRO-VERSION FORMAT
 ```
 
-`DISTRO-VERSION` is in the format that Ansible uses for `ansible_distribution`
-and `ansible_distribution_version` - for example, `Fedora-38`, `CentOS-8`,
+`DISTRO-VERSION` is in the format that Ansible uses for `ansible_facts["distribution"]`
+and `ansible_facts["distribution_version"]` - for example, `Fedora-38`, `CentOS-8`,
 `RedHat-9.4`
 
 `FORMAT` is one of `toml`, `json`, `yaml`, `raw`
diff --git a/README.md b/README.md
@@ -1752,7 +1752,7 @@ in /var/lib/pcsd with the file name FILENAME.crt and FILENAME.key, respectively.
   vars:
     ha_cluster_pcsd_certificates:
       - name: FILENAME
-        common_name: "{{ ansible_hostname }}"
+        common_name: "{{ ansible_facts['hostname'] }}"
         ca: self-sign
   roles:
     - linux-system-roles.ha_cluster
diff --git a/examples/create-pcsd-cert.yml b/examples/create-pcsd-cert.yml
@@ -7,7 +7,7 @@
   vars:
     ha_cluster_pcsd_certificates:
       - name: pcsd_cert
-        common_name: "{{ ansible_hostname }}"
+        common_name: "{{ ansible_facts['hostname'] }}"
         ca: self-sign
   roles:
     - linux-system-roles.ha_cluster
diff --git a/tasks/enable-repositories/Suse.yml b/tasks/enable-repositories/Suse.yml
@@ -6,7 +6,7 @@
 # All cluster packages are present on SLES_SAP and openSUSE,
 # but not on base SLES without HAE.
 - name: Block to assert that High Availability Extension is present on SLES
-  when: ansible_distribution == 'SLES'
+  when: ansible_facts["distribution"] == 'SLES'
   block:
 
     - name: Query package sle-ha-release  # noqa command-instead-of-module
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -37,7 +37,7 @@
             cmd: >-
               openssl passwd
                 -6
-                -salt {{ ansible_hostname.replace('-', 'x') | quote }}
+                -salt {{ ansible_facts['hostname'].replace('-', 'x') | quote }}
                 {{ ha_cluster_hacluster_password | string | quote }}
           register: __ha_cluster_openssl_call_result
           changed_when: false
@@ -74,7 +74,7 @@
           ha_cluster_sbd_enabled | ternary(__ha_cluster_sbd_packages, [])
           +
           ha_cluster_install_cloud_agents |
-            ternary(__ha_cluster_cloud_agents_packages[ansible_architecture]
+            ternary(__ha_cluster_cloud_agents_packages[ansible_facts['architecture']]
                 | d(__ha_cluster_cloud_agents_packages['noarch'] | d([])),
               [])
           +
@@ -86,7 +86,7 @@
     - name: Distribute fence-virt authkey
       include_tasks: distribute-fence-virt-key.yml
       when:
-        - ansible_architecture == "x86_64"
+        - ansible_facts["architecture"] == "x86_64"
 
     - name: Configure SBD
       include_tasks: shell_{{ ha_cluster_pacemaker_shell }}/sbd.yml
diff --git a/tasks/shell_crmsh/cluster-auth.yml b/tasks/shell_crmsh/cluster-auth.yml
@@ -54,8 +54,8 @@
         validate: 'visudo -cf %s'
       vars:
         __sudoers_path: >-
-          {% if (ansible_os_family == 'Suse' and
-                ansible_distribution_major_version | int > 15) %}
+          {% if (ansible_facts['os_family'] == 'Suse' and
+                ansible_facts['distribution_major_version'] | int > 15) %}
           /usr/etc/sudoers.d
           {%- else -%}
           /etc/sudoers.d
diff --git a/tasks/shell_crmsh/create-and-push-cib.yml b/tasks/shell_crmsh/create-and-push-cib.yml
@@ -5,7 +5,7 @@
 # the only thing which matters is pushing the resulting CIB to the cluster.
 
 # Create backup of current cib in /root
-- name: Gather facts for ansible_date_time
+- name: Gather facts for ansible_facts["date_time"]
   ansible.builtin.setup:
     filter:
       - 'ansible_date_time'
diff --git a/tasks/test_setup.yml b/tasks/test_setup.yml
@@ -33,7 +33,7 @@
   set_fact:
     ha_cluster_enable_repos: false
   when:
-    - ansible_distribution == 'RedHat'
+    - ansible_facts["distribution"] == 'RedHat'
 
 # HACK - test systems build ostree images with /usr/lib/passwd
 # have to copy hacluster user to /etc/passwd
diff --git a/templates/crmsh_corosync.j2 b/templates/crmsh_corosync.j2
@@ -44,13 +44,13 @@ nodelist {
 {% for node in ansible_play_batch %}
         node {
                 nodeid: {{ loop.index }}
-                name: {{ hostvars[node].__ha_cluster_local_node.node_name | d(hostvars[node]['ansible_hostname']) }}
+                name: {{ hostvars[node].__ha_cluster_local_node.node_name | d(hostvars[node].ansible_facts['hostname']) }}
 {% if hostvars[node].__ha_cluster_local_node.corosync_addresses is defined %}
 {% for addr in hostvars[node].__ha_cluster_local_node.corosync_addresses %}
                 ring{{ loop.index0 }}_addr: {{ addr | quote }}
 {% endfor %}
 {% else %}
-                ring0_addr: {{ hostvars[node].__ha_cluster_local_node.pcs_address | d(hostvars[node]['ansible_default_ipv4']['address']) }}
+                ring0_addr: {{ hostvars[node].__ha_cluster_local_node.pcs_address | d(hostvars[node].ansible_facts['default_ipv4']['address']) }}
 {% endif -%}
        }
 {% endfor %}
diff --git a/tests/tests_cluster_basic_custom_pcsd_tls_cert_role.yml b/tests/tests_cluster_basic_custom_pcsd_tls_cert_role.yml
@@ -33,7 +33,7 @@
           vars:
             ha_cluster_pcsd_certificates:
               - name: "{{ __cert_name }}"
-                common_name: "{{ ansible_hostname }}"
+                common_name: "{{ ansible_facts['hostname'] }}"
                 ca: self-sign
 
         - name: Stat pcsd TLS certificate
diff --git a/tests/vars/main.yml b/tests/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-__test_fence_virt_supported: "{{ ansible_architecture == 'x86_64' }}"
+__test_fence_virt_supported: "{{ ansible_facts['architecture'] == 'x86_64' }}"
diff --git a/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml
@@ -14,7 +14,7 @@ __ha_cluster_rh_distros:
 __ha_cluster_rh_distros_fedora: "{{ __ha_cluster_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__ha_cluster_is_rh_distro: "{{ ansible_distribution in __ha_cluster_rh_distros }}"
+__ha_cluster_is_rh_distro: "{{ ansible_facts['distribution'] in __ha_cluster_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__ha_cluster_is_rh_distro_fedora: "{{ ansible_distribution in __ha_cluster_rh_distros_fedora }}"
+__ha_cluster_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __ha_cluster_rh_distros_fedora }}"
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -42,5 +42,5 @@ __ha_cluster_services:
 __ha_cluster_fence_agent_packages_default: "{{
     ['fence-agents-all']
     +
-    (['fence-virt'] if ansible_architecture == 'x86_64' else [])
+    (['fence-virt'] if ansible_facts['architecture'] == 'x86_64' else [])
   }}"
diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml
@@ -6,7 +6,7 @@
 # id: repo ID used to enable the repo
 # name: user-friendly name of a repo used to check if the repo is enabled
 __ha_cluster_repos:
-  - id: rhel-10-for-{{ ansible_architecture }}-highavailability-rpms
+  - id: rhel-10-for-{{ ansible_facts['architecture'] }}-highavailability-rpms
     name: High Availability
 
 # cloud agent packages are also mentioned in library/ha_cluster_info.py
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
@@ -6,9 +6,9 @@
 # id: repo ID used to enable the repo
 # name: user-friendly name of a repo used to check if the repo is enabled
 __ha_cluster_repos:
-  - id: rhel-8-for-{{ ansible_architecture }}-highavailability-rpms
+  - id: rhel-8-for-{{ ansible_facts['architecture'] }}-highavailability-rpms
     name: High Availability
-  - id: rhel-8-for-{{ ansible_architecture }}-resilientstorage-rpms
+  - id: rhel-8-for-{{ ansible_facts['architecture'] }}-resilientstorage-rpms
     name: Resilient Storage
 
 # cloud agent packages are also mentioned in library/ha_cluster_info.py
diff --git a/vars/RedHat_9.yml b/vars/RedHat_9.yml
@@ -6,9 +6,9 @@
 # id: repo ID used to enable the repo
 # name: user-friendly name of a repo used to check if the repo is enabled
 __ha_cluster_repos:
-  - id: rhel-9-for-{{ ansible_architecture }}-highavailability-rpms
+  - id: rhel-9-for-{{ ansible_facts['architecture'] }}-highavailability-rpms
     name: High Availability
-  - id: rhel-9-for-{{ ansible_architecture }}-resilientstorage-rpms
+  - id: rhel-9-for-{{ ansible_facts['architecture'] }}-resilientstorage-rpms
     name: Resilient Storage
 
 # cloud agent packages are also mentioned in library/ha_cluster_info.py
diff --git a/vars/main.yml b/vars/main.yml
@@ -30,8 +30,8 @@ __ha_cluster_rh_distros:
 __ha_cluster_rh_distros_fedora: "{{ __ha_cluster_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__ha_cluster_is_rh_distro: "{{ ansible_distribution in __ha_cluster_rh_distros }}"
+__ha_cluster_is_rh_distro: "{{ ansible_facts['distribution'] in __ha_cluster_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__ha_cluster_is_rh_distro_fedora: "{{ ansible_distribution in __ha_cluster_rh_distros_fedora }}"
+__ha_cluster_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __ha_cluster_rh_distros_fedora }}"
 # END - DO NOT EDIT THIS BLOCK - rh distros variables
