refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead

tasks/insights-client.yml

@@ -156,7 +156,7 @@
 
 - name: Configure remediation
   when:
-    - ansible_distribution_version is version("8.4", ">=")
+    - ansible_facts['distribution_version'] is version("8.4", ">=")
     - rhc_insights.remediation | d("present") == "present"
   block:
     - name: Ensure worker and ansible packages are installed

tasks/main.yml

@@ -6,7 +6,7 @@
 - name: Handle insights unregistration
   include_tasks: insights-client-unregistration.yml
   when:
-    - ansible_distribution == "RedHat"
+    - ansible_facts['distribution'] == "RedHat"
     - >-
       rhc_insights.state | d("present") == "absent"
       or rhc_state | d("present") in ["absent", "reconnect"]
@@ -18,6 +18,6 @@
 - name: Handle insights registration
   include_tasks: insights-client.yml
   when:
-    - ansible_distribution == "RedHat"
+    - ansible_facts['distribution'] == "RedHat"
     - rhc_insights.state | d("present") == "present"
     - rhc_state | d("present") in ["present", "reconnect"]

tasks/set_vars.yml

@@ -21,7 +21,7 @@
 - name: Check if insights-packages are installed
   package_facts:
   when:
-    - ansible_distribution == "RedHat"
+    - ansible_facts['distribution'] == "RedHat"
     - >-
       rhc_insights.state | d("present") == "absent"
       or rhc_state | d("present") in ["absent", "reconnect"]

tests/tasks/setup_candlepin.yml

@@ -55,8 +55,8 @@
           - --publish
           - 8080:8080
           - "{{ '--privileged'
-            if (ansible_distribution in ['CentOS', 'RedHat']
-                and ansible_distribution_major_version | int < 8)
+            if (ansible_facts['distribution'] in ['CentOS', 'RedHat']
+                and ansible_facts['distribution_major_version'] | int < 8)
             else '' }}"
           - ghcr.io/candlepin/candlepin-unofficial
       command:

tests/tests_environments.yml

@@ -86,10 +86,10 @@
             - name: Check the enabled environments
               when:
                 - >-
-                  ansible_distribution not in ["CentOS", "RedHat"]
-                  or (ansible_distribution == "CentOS"
-                      and ansible_distribution_major_version | int >= 8)
-                  or (ansible_distribution_version is version("8.6", ">="))
+                  ansible_facts["distribution"] not in ["CentOS", "RedHat"]
+                  or (ansible_facts["distribution"] == "CentOS"
+                      and ansible_facts["distribution_major_version"] | int >= 8)
+                  or (ansible_facts["distribution_version"] is version("8.6", ">="))
               block:
                 - name: Get enabled environments
                   include_tasks: tasks/list_environments.yml

tests/tests_insights_remediation.yml

@@ -18,7 +18,7 @@
     - name: Skip if the RHEL version is older than 8.4
       meta: end_play
       when:
-        - ansible_distribution_version is version("8.4", "<")
+        - ansible_facts["distribution_version"] is version("8.4", "<")
 
     - name: Test remediation
       block:

tests/vars/rh_distros_vars.yml

@@ -14,7 +14,7 @@ __rhc_rh_distros:
 __rhc_rh_distros_fedora: "{{ __rhc_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__rhc_is_rh_distro: "{{ ansible_distribution in __rhc_rh_distros }}"
+__rhc_is_rh_distro: "{{ ansible_facts['distribution'] in __rhc_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__rhc_is_rh_distro_fedora: "{{ ansible_distribution in __rhc_rh_distros_fedora }}"
+__rhc_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __rhc_rh_distros_fedora }}"

vars/main.yml

@@ -29,7 +29,7 @@ __rhc_insights_tags: "/etc/insights-client/tags.yaml"
 # to Insights, used for remediations; starting from EL 10 the service is the
 # upstream one, and no more the downstream-branded one
 __rhc_yggdrasil_systemd_service: "{{ 'yggdrasil'
-  if (ansible_distribution_major_version | int >= 10)
+  if (ansible_facts['distribution_major_version'] | int >= 10)
   else 'rhcd' }}"
 
 # BEGIN - DO NOT EDIT THIS BLOCK - rh distros variables
@@ -44,8 +44,8 @@ __rhc_rh_distros:
 __rhc_rh_distros_fedora: "{{ __rhc_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__rhc_is_rh_distro: "{{ ansible_distribution in __rhc_rh_distros }}"
+__rhc_is_rh_distro: "{{ ansible_facts['distribution'] in __rhc_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__rhc_is_rh_distro_fedora: "{{ ansible_distribution in __rhc_rh_distros_fedora }}"
+__rhc_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __rhc_rh_distros_fedora }}"
 # END - DO NOT EDIT THIS BLOCK - rh distros variables