From 7ca04d0d3dc6c1b6e04ba7090e903776e89d9a32 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Fri, 26 Sep 2025 14:55:02 +0100 Subject: [PATCH] Constrain OS-specific variables lookup to role var directory Signed-off-by: Jim Enright --- roles/prereq_jdk/tasks/main.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/roles/prereq_jdk/tasks/main.yml b/roles/prereq_jdk/tasks/main.yml index 6b4fbf0a..f8906417 100644 --- a/roles/prereq_jdk/tasks/main.yml +++ b/roles/prereq_jdk/tasks/main.yml @@ -36,13 +36,16 @@ - name: Include OS-specific variables ansible.builtin.include_vars: "{{ item }}" with_first_found: - - "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml" - - "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" - - "{{ ansible_facts['distribution'] }}.yml" - - "{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_version'] }}.yml" - - "{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" - - "{{ ansible_facts['os_family'] }}.yml" - - "default.yml" + - files: + - "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml" + - "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" + - "{{ ansible_facts['distribution'] }}.yml" + - "{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_version'] }}.yml" + - "{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" + - "{{ ansible_facts['os_family'] }}.yml" + - "default.yml" + paths: + - "{{ role_path }}/vars" - name: Install JDK when: jdk_install_packages