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_default.yml

@@ -23,7 +23,7 @@
 
     - name: Verify that /run/log/journal/$MACHINE_ID/system.journal exists
       stat:
-        path: /run/log/journal/{{ ansible_machine_id }}/system.journal
+        path: /run/log/journal/{{ ansible_facts['machine_id'] }}/system.journal
       register: __stat
       failed_when: not __stat.stat.exists
 
@@ -32,7 +32,7 @@
         cmd: >
           set -euo pipefail;
           journalctl --header
-          --file /run/log/journal/{{ ansible_machine_id }}/system.journal |
+          --file /run/log/journal/{{ ansible_facts['machine_id'] }}/system.journal |
           grep -q 'State: ONLINE'
       changed_when: false
 
@@ -41,6 +41,6 @@
         cmd: >
           set -euo pipefail;
           journalctl --header
-          --file /run/log/journal/{{ ansible_machine_id }}/system.journal |
+          --file /run/log/journal/{{ ansible_facts['machine_id'] }}/system.journal |
           grep -q COMPRESSED
       changed_when: false

tests/tests_example.yml

@@ -104,7 +104,7 @@
 
         - name: Verify that /var/log/journal/$MACHINE_ID/system.journal exists
           stat:
-            path: /var/log/journal/{{ ansible_machine_id }}/system.journal
+            path: /var/log/journal/{{ ansible_facts['machine_id'] }}/system.journal
           register: __stat
           failed_when: not __stat.stat.exists
 
@@ -113,7 +113,7 @@
             cmd: >
               set -euo pipefail;
               journalctl --header
-              --file /var/log/journal/{{ ansible_machine_id }}/system.journal |
+              --file /var/log/journal/{{ ansible_facts['machine_id'] }}/system.journal |
               grep -q 'State: ONLINE'
           changed_when: false
 
@@ -122,7 +122,7 @@
             cmd: >
               set -euo pipefail;
               journalctl --header
-              --file /var/log/journal/{{ ansible_machine_id }}/system.journal |
+              --file /var/log/journal/{{ ansible_facts['machine_id'] }}/system.journal |
               grep -q COMPRESSED
           changed_when: false
 

tests/vars/rh_distros_vars.yml

@@ -14,7 +14,7 @@ __journald_rh_distros:
 __journald_rh_distros_fedora: "{{ __journald_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__journald_is_rh_distro: "{{ ansible_distribution in __journald_rh_distros }}"
+__journald_is_rh_distro: "{{ ansible_facts['distribution'] in __journald_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__journald_is_rh_distro_fedora: "{{ ansible_distribution in __journald_rh_distros_fedora }}"
+__journald_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __journald_rh_distros_fedora }}"

vars/main.yml

@@ -32,8 +32,8 @@ __journald_rh_distros:
 __journald_rh_distros_fedora: "{{ __journald_rh_distros + ['Fedora'] }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone
-__journald_is_rh_distro: "{{ ansible_distribution in __journald_rh_distros }}"
+__journald_is_rh_distro: "{{ ansible_facts['distribution'] in __journald_rh_distros }}"
 
 # Use this in conditionals to check if distro is Red Hat or clone, or Fedora
-__journald_is_rh_distro_fedora: "{{ ansible_distribution in __journald_rh_distros_fedora }}"
+__journald_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __journald_rh_distros_fedora }}"
 # END - DO NOT EDIT THIS BLOCK - rh distros variables