diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring/vars/main.yaml index 9edc5f354a29a2656e12759af0589c42749a6982..80bf2edf61bbedf605a3113db2cf841d04cb67ef 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 8b7284e426fba96d8fffd9d11e5d153b09edf120..8ddae8c719b4485a650b1686773214608e92ab66 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 1431f67c8cbc40dbb900c7a07be086c54ae196fe..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/piacere_monitoring_requirements/ssh_key.j2 +++ b/piacere_monitoring_requirements/ssh_key.j2 @@ -1 +0,0 @@ -{{ instance_server_private_key_user1 }}