From d80f5e5a2c2b1bcc2396f7ccf9d6d2dfde19ec33 Mon Sep 17 00:00:00 2001 From: Djerfy Date: Wed, 13 Jan 2021 16:57:05 +0100 Subject: [PATCH] Fix with_first_found fail when ansible_distribution vars file is missing (issue #5) --- tasks/main.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 45d72ed..2a01249 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,10 +4,12 @@ # tasks file for fusioninventory - name: Include package list per OS - include_vars: "{{ item }}" - with_first_found: - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" + include_vars: "{{ lookup('first_found', params) }}" + vars: + params: + files: + - "{{ ansible_distribution }}.yml" + - "{{ ansible_os_family }}.yml" # Manage dependent packages [[[1 - name: Ensure dependent packages are installed @@ -23,10 +25,12 @@ # Manage agent package [[[1 # Specific tasks per OS will be in the include otherwise below -- include: "{{ item }}" - with_first_found: - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" +- include: "{{ lookup('first_found', params) }}" + vars: + params: + files: + - "{{ ansible_distribution }}.yml" + - "{{ ansible_os_family }}.yml" - name: Ensure fusioninventory-agent package from REPOS package: