refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead

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`

tests/tasks/assert_kernel_settings.yml

@@ -4,9 +4,9 @@
   vars:
     ffparams:
       files:
-        - "tests_{{ ansible_distribution }}_\
-          {{ ansible_distribution_major_version }}.yml"
-        - "tests_{{ ansible_distribution }}.yml"
+        - "tests_{{ ansible_facts['distribution'] }}_\
+          {{ ansible_facts['distribution_major_version'] }}.yml"
+        - "tests_{{ ansible_facts['distribution'] }}.yml"
         - "tests_default.yml"
       paths:
         - vars

tests/tests_include_vars_from_parent.yml

@@ -33,10 +33,10 @@
             # create all variants like CentOS, CentOS_8.1, CentOS-8.1,
             # CentOS-8, CentOS-8.1
             # more formally:
-            # {{ ansible_distribution }}-{{ ansible_distribution_version }}
-            # {{ ansible_distribution }}-{{ ansible_distribution_major_version }}
-            # {{ ansible_distribution }}
-            # {{ ansible_os_family }}
+            # {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}
+            # {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}
+            # {{ ansible_facts['distribution'] }}
+            # {{ ansible_facts['os_family'] }}
             # and the same for _ as separator.
             varfiles: "{{ [facts['distribution']] | product(separators) |
               map('join') | product(versions) | map('join') | list +

tests/tests_simple_settings.yml

@@ -16,7 +16,7 @@
             kernel_settings_bootloader_cmdline: null
             __kernel_settings_blcmdline_value: null
             __kernel_settings_check_reboot: false
-          when: ansible_distribution == "Fedora"
+          when: ansible_facts["distribution"] == "Fedora"
 
         # use public: true here so that the private role
         # variables will be exported - we use

tests/vars/rh_distros_vars.yml

@@ -14,7 +14,7 @@ __kernel_settings_rh_distros:
 __kernel_settings_rh_distros_fedora: "{{ __kernel_settings_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__kernel_settings_is_rh_distro: "{{ ansible_distribution in __kernel_settings_rh_distros }}"
+__kernel_settings_is_rh_distro: "{{ ansible_facts['distribution'] in __kernel_settings_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__kernel_settings_is_rh_distro_fedora: "{{ ansible_distribution in __kernel_settings_rh_distros_fedora }}"
+__kernel_settings_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __kernel_settings_rh_distros_fedora }}"

vars/main.yml

@@ -44,8 +44,8 @@ __kernel_settings_rh_distros:
 __kernel_settings_rh_distros_fedora: "{{ __kernel_settings_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__kernel_settings_is_rh_distro: "{{ ansible_distribution in __kernel_settings_rh_distros }}"
+__kernel_settings_is_rh_distro: "{{ ansible_facts['distribution'] in __kernel_settings_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__kernel_settings_is_rh_distro_fedora: "{{ ansible_distribution in __kernel_settings_rh_distros_fedora }}"
+__kernel_settings_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __kernel_settings_rh_distros_fedora }}"
 # END - DO NOT EDIT THIS BLOCK - rh distros variables