From 0f87c792a2310b4d1289cea353567a7b9a003db3 Mon Sep 17 00:00:00 2001 From: s3lph Date: Wed, 3 Nov 2021 11:02:59 +0100 Subject: [PATCH] Fix jinja syntax error --- roles/prometheus_node/tasks/install.yml | 13 ++++++++----- roles/prometheus_node/tasks/main.yml | 15 +++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/roles/prometheus_node/tasks/install.yml b/roles/prometheus_node/tasks/install.yml index 2206f9f..297533b 100644 --- a/roles/prometheus_node/tasks/install.yml +++ b/roles/prometheus_node/tasks/install.yml @@ -1,10 +1,13 @@ --- - name: install node exporter - include_tasks: "{{ lookup('ansible.builtin.first_found', paths=['tasks/install'], files=files) }}" + ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', 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" + paths: + - tasks/install + 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 10f984c..c0cdf95 100644 --- a/roles/prometheus_node/tasks/main.yml +++ b/roles/prometheus_node/tasks/main.yml @@ -1,14 +1,17 @@ --- - name: include os specific vars - include_vars: "{{ lookup('ansible.builtin.first_found', paths=['vars'], files=files) }}" + include_vars: "{{ lookup('ansible.builtin.first_found', 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" + paths: + - 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"