Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README-ostree.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions tests/vars/rh_distros_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
4 changes: 2 additions & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading