From 63686f8bc207a8922fa5ca74c2642fbb3fe6c1c3 Mon Sep 17 00:00:00 2001
From: Gorka Benguria <gorka.benguria@tecnalia.com>
Date: Fri, 16 Sep 2022 16:59:02 +0200
Subject: [PATCH] removes defaults and force to have value
---
piacere_monitoring/main.yml | 2 +-
piacere_monitoring/vars/main.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/piacere_monitoring/main.yml b/piacere_monitoring/main.yml
index e1ed843..d25c4c0 100644
--- a/piacere_monitoring/main.yml
+++ b/piacere_monitoring/main.yml
@@ -3,7 +3,7 @@
- name: Check parameters
fail:
msg: 'variable {{item}} not defined'
- when: item is not defined
+ when: (item is not defined) or (item|length == 0)
with_items:
- pma_deployment_id
- pma_influxdb_bucket
diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring/vars/main.yaml
index 80bf2ed..b664b6f 100644
--- a/piacere_monitoring/vars/main.yaml
+++ b/piacere_monitoring/vars/main.yaml
@@ -1,8 +1,8 @@
-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' }}"
+pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) }}"
+pma_influxdb_bucket: "{{ lookup('env', 'INFLUXDB_BUCKET' }}"
+pma_influxdb_token: "{{ lookup('env', 'INFLUXDB_TOKEN' }}"
+pma_influxdb_org: "{{ lookup('env', 'INFLUXDB_ORG' ) }}"
+pma_influxdb_addr: "{{ lookup('env', 'INFLUXDB_ADDR' ) }}"
telegraf_agent_package_state: latest
--
GitLab