From 9facda8f9a35c696d02c4e03c6c1d1416f47d4b3 Mon Sep 17 00:00:00 2001
From: Gorka Benguria <gorka.benguria@tecnalia.com>
Date: Fri, 16 Sep 2022 14:08:16 +0200
Subject: [PATCH] fixes the env variable or default
---
piacere_monitoring/vars/main.yaml | 10 +++++-----
piacere_monitoring_requirements/config.yaml | 4 +---
piacere_monitoring_requirements/ssh_key.j2 | 1 -
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring/vars/main.yaml
index 9edc5f3..80bf2ed 100644
--- a/piacere_monitoring/vars/main.yaml
+++ b/piacere_monitoring/vars/main.yaml
@@ -1,8 +1,8 @@
-pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) | default('123e4567-e89b-12d3-a456-426614174002') }}"
-pma_influxdb_bucket: "{{ lookup('env', 'INFLUXDB_BUCKET' ) | default('bucket') }}"
-pma_influxdb_token: "{{ lookup('env', 'INFLUXDB_TOKEN' ) | default('piacerePassword') }}"
-pma_influxdb_org: "{{ lookup('env', 'INFLUXDB_ORG' ) | default('piacere') }}"
-pma_influxdb_addr: "{{ lookup('env', 'INFLUXDB_ADDR' ) | default('https://influxdb.pm.ci.piacere.digital.tecnalia.dev') }}"
+pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) or '123e4567-e89b-12d3-a456-426614174002' }}"
+pma_influxdb_bucket: "{{ lookup('env', 'INFLUXDB_BUCKET' ) or 'bucket' }}"
+pma_influxdb_token: "{{ lookup('env', 'INFLUXDB_TOKEN' ) or 'piacerePassword' }}"
+pma_influxdb_org: "{{ lookup('env', 'INFLUXDB_ORG' ) or 'piacere' }}"
+pma_influxdb_addr: "{{ lookup('env', 'INFLUXDB_ADDR' ) or 'https://influxdb.pm.ci.piacere.digital.tecnalia.dev' }}"
telegraf_agent_package_state: latest
diff --git a/piacere_monitoring_requirements/config.yaml b/piacere_monitoring_requirements/config.yaml
index 8b7284e..8ddae8c 100644
--- a/piacere_monitoring_requirements/config.yaml
+++ b/piacere_monitoring_requirements/config.yaml
@@ -1,8 +1,6 @@
---
-input:
- - instance_ip_vm1
- - instance_server_private_key_user1
+input: []
output: []
engine: ansible
...
diff --git a/piacere_monitoring_requirements/ssh_key.j2 b/piacere_monitoring_requirements/ssh_key.j2
index 1431f67..e69de29 100644
--- a/piacere_monitoring_requirements/ssh_key.j2
+++ b/piacere_monitoring_requirements/ssh_key.j2
@@ -1 +0,0 @@
-{{ instance_server_private_key_user1 }}
--
GitLab