diff --git a/README-ostree.md b/README-ostree.md index a9f0185b..af5bcdcd 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/tests_include_vars_from_parent.yml b/tests/tests_include_vars_from_parent.yml index 6d7ebd45..ed74fdfb 100644 --- a/tests/tests_include_vars_from_parent.yml +++ b/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 + diff --git a/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml index 7ebe1d92..9ae18c21 100644 --- a/tests/vars/rh_distros_vars.yml +++ b/tests/vars/rh_distros_vars.yml @@ -14,7 +14,7 @@ __ssh_rh_distros: __ssh_rh_distros_fedora: "{{ __ssh_rh_distros + ['Fedora'] }}" # Use this in conditionals to check if distro is Red Hat or clone -__ssh_is_rh_distro: "{{ ansible_distribution in __ssh_rh_distros }}" +__ssh_is_rh_distro: "{{ ansible_facts['distribution'] in __ssh_rh_distros }}" # Use this in conditionals to check if distro is Red Hat or clone, or Fedora -__ssh_is_rh_distro_fedora: "{{ ansible_distribution in __ssh_rh_distros_fedora }}" +__ssh_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __ssh_rh_distros_fedora }}" diff --git a/vars/main.yml b/vars/main.yml index 038d91cc..5ffd92a0 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -38,8 +38,8 @@ __ssh_rh_distros: __ssh_rh_distros_fedora: "{{ __ssh_rh_distros + ['Fedora'] }}" # Use this in conditionals to check if distro is Red Hat or clone -__ssh_is_rh_distro: "{{ ansible_distribution in __ssh_rh_distros }}" +__ssh_is_rh_distro: "{{ ansible_facts['distribution'] in __ssh_rh_distros }}" # Use this in conditionals to check if distro is Red Hat or clone, or Fedora -__ssh_is_rh_distro_fedora: "{{ ansible_distribution in __ssh_rh_distros_fedora }}" +__ssh_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __ssh_rh_distros_fedora }}" # END - DO NOT EDIT THIS BLOCK - rh distros variables