compatcheck: Use new ansible facts syntax
This commit is contained in:
@@ -4,10 +4,10 @@
|
|||||||
msg: "{{ lookup('ansible.builtin.template', 'distroerror.j2').strip() }}"
|
msg: "{{ lookup('ansible.builtin.template', 'distroerror.j2').strip() }}"
|
||||||
when: >
|
when: >
|
||||||
_compatcheck_distro | length != 1 or (
|
_compatcheck_distro | length != 1 or (
|
||||||
ansible_distribution_major_version != 'n/a' and
|
ansible_facts.distribution_major_version != 'n/a' and
|
||||||
_compatcheck_distro[0].version_min | default(0) > ansible_distribution_major_version | int
|
_compatcheck_distro[0].version_min | default(0) > ansible_facts.distribution_major_version | int
|
||||||
) or
|
) or
|
||||||
_compatcheck_distro[0].version_max is defined and _compatcheck_distro[0].version_max < ansible_distribution_major_version | int or
|
_compatcheck_distro[0].version_max is defined and _compatcheck_distro[0].version_max < ansible_facts.distribution_major_version | int or
|
||||||
ansible_pkg_mgr not in _compatcheck_distro[0].package_managers | default([_compatcheck_default_package_manager])
|
ansible_facts.pkg_mgr not in _compatcheck_distro[0].package_managers | default([_compatcheck_default_package_manager])
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: checkfailed
|
loop_var: checkfailed
|
||||||
|
|||||||
@@ -15,4 +15,4 @@
|
|||||||
{{ distros.append(distro_name ~ distro_package_managers_str) }}
|
{{ distros.append(distro_name ~ distro_package_managers_str) }}
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
{%- endfor -%}
|
{%- endfor -%}
|
||||||
This role only supports {{ distros | join(', ') }} (You are running {{ ansible_distribution }} {{ ansible_distribution_major_version }} ({{ ansible_pkg_mgr }})
|
This role only supports {{ distros | join(', ') }} (You are running {{ ansible_facts.distribution }} {{ ansible_facts.distribution_major_version }} ({{ ansible_facts.pkg_mgr }})
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
---
|
---
|
||||||
_compatcheck_distro: "{{ compatcheck_supported_distributions | selectattr('name', 'equalto', ansible_distribution | lower) }}"
|
_compatcheck_distro: "{{ compatcheck_supported_distributions | selectattr('name', 'equalto', ansible_facts.distribution | lower) }}"
|
||||||
_compatcheck_default_package_managers:
|
_compatcheck_default_package_managers:
|
||||||
debian: apt
|
debian: apt
|
||||||
ubuntu: apt
|
ubuntu: apt
|
||||||
fedora: dnf
|
fedora: dnf
|
||||||
archlinux: pacman
|
archlinux: pacman
|
||||||
macosx: homebrew
|
macosx: homebrew
|
||||||
_compatcheck_default_package_manager: "{{ _compatcheck_default_package_managers[ansible_distribution | lower] }}"
|
_compatcheck_default_package_manager: "{{ _compatcheck_default_package_managers[ansible_facts.distribution | lower] }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user