From 1d5918bc6da051ee491abd2182af26eb75da15cd Mon Sep 17 00:00:00 2001 From: uumas Date: Sun, 2 Aug 2026 00:10:59 +0300 Subject: [PATCH] compatcheck: Use new ansible facts syntax --- roles/compatcheck/tasks/main.yaml | 8 ++++---- roles/compatcheck/templates/distroerror.j2 | 2 +- roles/compatcheck/vars/main.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/compatcheck/tasks/main.yaml b/roles/compatcheck/tasks/main.yaml index 6f1b6ed..7ac2998 100644 --- a/roles/compatcheck/tasks/main.yaml +++ b/roles/compatcheck/tasks/main.yaml @@ -4,10 +4,10 @@ msg: "{{ lookup('ansible.builtin.template', 'distroerror.j2').strip() }}" when: > _compatcheck_distro | length != 1 or ( - ansible_distribution_major_version != 'n/a' and - _compatcheck_distro[0].version_min | default(0) > ansible_distribution_major_version | int + ansible_facts.distribution_major_version != 'n/a' and + _compatcheck_distro[0].version_min | default(0) > ansible_facts.distribution_major_version | int ) or - _compatcheck_distro[0].version_max is defined and _compatcheck_distro[0].version_max < ansible_distribution_major_version | int or - ansible_pkg_mgr not in _compatcheck_distro[0].package_managers | default([_compatcheck_default_package_manager]) + _compatcheck_distro[0].version_max is defined and _compatcheck_distro[0].version_max < ansible_facts.distribution_major_version | int or + ansible_facts.pkg_mgr not in _compatcheck_distro[0].package_managers | default([_compatcheck_default_package_manager]) loop_control: loop_var: checkfailed diff --git a/roles/compatcheck/templates/distroerror.j2 b/roles/compatcheck/templates/distroerror.j2 index 10b50c5..9572bbe 100644 --- a/roles/compatcheck/templates/distroerror.j2 +++ b/roles/compatcheck/templates/distroerror.j2 @@ -15,4 +15,4 @@ {{ distros.append(distro_name ~ distro_package_managers_str) }} {%- endif -%} {%- 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 }}) diff --git a/roles/compatcheck/vars/main.yaml b/roles/compatcheck/vars/main.yaml index 9a4dedc..cc51dab 100644 --- a/roles/compatcheck/vars/main.yaml +++ b/roles/compatcheck/vars/main.yaml @@ -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: debian: apt ubuntu: apt fedora: dnf archlinux: pacman 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] }}"