From a8a30426997d42df767debd45a1f7de896e089fd Mon Sep 17 00:00:00 2001
From: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
Date: Wed, 3 Nov 2021 10:57:44 +0100
Subject: [PATCH] Fix first_found logic

---
 roles/prometheus_node/tasks/install.yml | 13 +++++++------
 roles/prometheus_node/tasks/main.yml    | 15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/roles/prometheus_node/tasks/install.yml b/roles/prometheus_node/tasks/install.yml
index 2f2a4a2..2206f9f 100644
--- a/roles/prometheus_node/tasks/install.yml
+++ b/roles/prometheus_node/tasks/install.yml
@@ -1,9 +1,10 @@
 ---
 
 - name: install node exporter
-  include_tasks: "install/{{ item }}.yml"
-  with_first_found:
-    - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}_{% if 'major_release' in ansible_lsb %}{{ ansible_lsb.major_release }}{% else %}{{ ansible_distribution_version}}{% endif %}"
-    - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}"
-    - "{{ ansible_distribution }}_{{ ansible_distribution_version }}"
-    - "{{ ansible_distribution }}"
+  include_tasks: "{{ lookup('ansible.builtin.first_found', paths=['tasks/install'], files=files) }}"
+  vars:
+    files:
+      - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}_{% if 'major_release' in ansible_lsb %}{{ ansible_lsb.major_release }}{% else %}{{ ansible_distribution_version}}{% endif %}.yml"
+      - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}.yml"
+      - "{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml"
+      - "{{ ansible_distribution }}.yml"
diff --git a/roles/prometheus_node/tasks/main.yml b/roles/prometheus_node/tasks/main.yml
index 5c7448d..d21f59b 100644
--- a/roles/prometheus_node/tasks/main.yml
+++ b/roles/prometheus_node/tasks/main.yml
@@ -1,13 +1,14 @@
 ---
 
 - name: include os specific vars
-  include_vars: "{{ item }}.yml"
-  with_first_found:
-    - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}_{% if 'major_release' in ansible_lsb %}{{ ansible_lsb.major_release }}{% else %}{{ ansible_distribution_version }}{% endif %}"
-    - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}"
-    - "{{ ansible_distribution }}_{{ ansible_distribution_version }}"
-    - "{{ ansible_distribution }}"
-    - "default"
+  include_vars: "{{ lookup('ansible.builtin.first_found', paths=['vars'], files=files)"
+  vars:
+    files:
+      - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}_{% if 'major_release' in ansible_lsb %}{{ ansible_lsb.major_release }}{% else %}{{ ansible_distribution_version }}{% endif %}.yml"
+      - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{{ ansible_distribution }}{% endif %}.yml"
+      - "{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml"
+      - "{{ ansible_distribution }}.yml"
+      - "default.yml"
   tags:
     - "role::prometheus_node"
     - "role::prometheus_node:install"