From eab9f7849435eafee345c447fa63f64f6c164395 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 8 Jan 2026 08:03:42 -0700 Subject: [PATCH] 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 --- README-ostree.md | 4 ++-- tests/vars/rh_distros_vars.yml | 4 ++-- vars/main.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README-ostree.md b/README-ostree.md index a9f0185..af5bcdc 100644 --- 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/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml index 20cd727..1cbb314 100644 --- a/tests/vars/rh_distros_vars.yml +++ b/tests/vars/rh_distros_vars.yml @@ -14,7 +14,7 @@ __systemd_rh_distros: __systemd_rh_distros_fedora: "{{ __systemd_rh_distros + ['Fedora'] }}" # Use this in conditionals to check if distro is Red Hat or clone -__systemd_is_rh_distro: "{{ ansible_distribution in __systemd_rh_distros }}" +__systemd_is_rh_distro: "{{ ansible_facts['distribution'] in __systemd_rh_distros }}" # Use this in conditionals to check if distro is Red Hat or clone, or Fedora -__systemd_is_rh_distro_fedora: "{{ ansible_distribution in __systemd_rh_distros_fedora }}" +__systemd_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __systemd_rh_distros_fedora }}" diff --git a/vars/main.yml b/vars/main.yml index 9ab1b2e..18fd428 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -25,8 +25,8 @@ __systemd_rh_distros: __systemd_rh_distros_fedora: "{{ __systemd_rh_distros + ['Fedora'] }}" # Use this in conditionals to check if distro is Red Hat or clone -__systemd_is_rh_distro: "{{ ansible_distribution in __systemd_rh_distros }}" +__systemd_is_rh_distro: "{{ ansible_facts['distribution'] in __systemd_rh_distros }}" # Use this in conditionals to check if distro is Red Hat or clone, or Fedora -__systemd_is_rh_distro_fedora: "{{ ansible_distribution in __systemd_rh_distros_fedora }}" +__systemd_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __systemd_rh_distros_fedora }}" # END - DO NOT EDIT THIS BLOCK - rh distros variables