From 04625e6dfa30df8acf1793d275637523e4e729b0 Mon Sep 17 00:00:00 2001
From: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
Date: Wed, 3 Nov 2021 10:45:45 +0100
Subject: [PATCH] Fix task inclusion in prometheus_node

---
 roles/prometheus_node/tasks/install.yml | 9 +++++++++
 roles/prometheus_node/tasks/main.yml    | 8 +-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 roles/prometheus_node/tasks/install.yml

diff --git a/roles/prometheus_node/tasks/install.yml b/roles/prometheus_node/tasks/install.yml
new file mode 100644
index 0000000..1402541
--- /dev/null
+++ b/roles/prometheus_node/tasks/install.yml
@@ -0,0 +1,9 @@
+---
+
+- name: install node exporter
+  include_tasks: "install/{{ item }}.yml"
+  with_first_found:
+    - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{% ansible_distribution %}_{% 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 }}"
diff --git a/roles/prometheus_node/tasks/main.yml b/roles/prometheus_node/tasks/main.yml
index b9be950..6421d19 100644
--- a/roles/prometheus_node/tasks/main.yml
+++ b/roles/prometheus_node/tasks/main.yml
@@ -15,16 +15,10 @@
     - "role::prometheus_node:config"
 
 - name: install node exporter
-  import_tasks: "install/{{ item }}.yml"
-  with_first_found:
-    - "{% if 'id' in ansible_lsb %}{{ ansible_lsb.id }}{% else %}{% ansible_distribution %}_{% 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 }}"
+  import_tasks: install.yml
   tags:
     - "role::prometheus_node"
     - "role::prometheus_node:install"
-      
 
 - name: install custom textfile collectors
   import_tasks: collectors.yml