refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead

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>

Author: richm

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/tests_include_vars_from_parent.yml

@@ -30,10 +30,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_trusted_execution.yml

@@ -51,7 +51,7 @@
             - "{{ __test_fpd_exe2 }}"
           vars:
             __python: "{{ ansible_python_interpreter |
-              d(discovered_interpreter_python) }}"
+              d(ansible_facts['discovered_interpreter_python']) }}"
 
         - name: Create a new user
           user:

tests/vars/rh_distros_vars.yml

@@ -14,7 +14,7 @@ __fapolicyd_rh_distros:
 __fapolicyd_rh_distros_fedora: "{{ __fapolicyd_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__fapolicyd_is_rh_distro: "{{ ansible_distribution in __fapolicyd_rh_distros }}"
+__fapolicyd_is_rh_distro: "{{ ansible_facts['distribution'] in __fapolicyd_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__fapolicyd_is_rh_distro_fedora: "{{ ansible_distribution in __fapolicyd_rh_distros_fedora }}"
+__fapolicyd_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __fapolicyd_rh_distros_fedora }}"

vars/main.yml

@@ -15,16 +15,20 @@ __fapolicyd_selinux_packages: [fapolicyd-selinux]
 
 # ansible_facts required by the role
 __fapolicyd_required_facts:
+  - discovered_interpreter_python
   - distribution
   - distribution_major_version
   - distribution_version
   - os_family
 
+__fapolicyd_no_subsets_facts:
+  - discovered_interpreter_python
+
 # the subsets of ansible_facts that need to be gathered in case any of the
 # facts in required_facts is missing; see the documentation of
 # the 'gather_subset' parameter of the 'setup' module
 __fapolicyd_required_facts_subsets: "{{ ['!all', '!min'] +
-  __fapolicyd_required_facts }}"
+  __fapolicyd_required_facts | difference(__fapolicyd_no_subsets_facts) }}"
 
 # BEGIN - DO NOT EDIT THIS BLOCK - rh distros variables
 # Ansible distribution identifiers that the role treats like RHEL
@@ -38,8 +42,8 @@ __fapolicyd_rh_distros:
 __fapolicyd_rh_distros_fedora: "{{ __fapolicyd_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__fapolicyd_is_rh_distro: "{{ ansible_distribution in __fapolicyd_rh_distros }}"
+__fapolicyd_is_rh_distro: "{{ ansible_facts['distribution'] in __fapolicyd_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__fapolicyd_is_rh_distro_fedora: "{{ ansible_distribution in __fapolicyd_rh_distros_fedora }}"
+__fapolicyd_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __fapolicyd_rh_distros_fedora }}"
 # END - DO NOT EDIT THIS BLOCK - rh distros variables