From 3e269c4c295e3dd81dfeaebe9de4c4a702e7f1d5 Mon Sep 17 00:00:00 2001 From: Kamil Wiatrowski Date: Thu, 11 Oct 2018 13:10:06 +0200 Subject: ansible: Set IP address of influxdb for grafana Set ip address to influxdb for grafana based on provided hostname. IP address in numerical format is required by grafana container. Mapping of hostname in /etc/hosts is no longer required. Change-Id: I684de737c6f8e48b5b9f256541901852d7ecc05a Signed-off-by: Kamil Wiatrowski --- docker/ansible/roles/run_grafana/tasks/main.yml | 7 +------ docker/ansible/roles/run_grafana/vars/main.yml | 6 ++++-- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'docker/ansible/roles/run_grafana') diff --git a/docker/ansible/roles/run_grafana/tasks/main.yml b/docker/ansible/roles/run_grafana/tasks/main.yml index ea4ca8b9..0ec307fa 100644 --- a/docker/ansible/roles/run_grafana/tasks/main.yml +++ b/docker/ansible/roles/run_grafana/tasks/main.yml @@ -31,9 +31,6 @@ - rm_grafana_image when: rm_images|default(false)|bool == true -- set_fact: - influxdb_host_ip_mapping: "{ '{{ influxdb_hostname }}': '{{ influxdb_host_ip }}' }" - - name: Cleanup barometer-grafana cache directory under host file: path: /var/lib/grafana @@ -49,9 +46,7 @@ ports: - 3000:3000 env: - influxdb_host: "{{ influxdb_hostname }}" - etc_hosts: - "{{ influxdb_host_ip_mapping }}" + influxdb_host: "{{ influxdb_host_ip }}" detach: yes restart: yes network_mode: host diff --git a/docker/ansible/roles/run_grafana/vars/main.yml b/docker/ansible/roles/run_grafana/vars/main.yml index 0975b598..eb2d5274 100644 --- a/docker/ansible/roles/run_grafana/vars/main.yml +++ b/docker/ansible/roles/run_grafana/vars/main.yml @@ -13,5 +13,7 @@ # limitations under the License. --- -influxdb_hostname: localhost -influxdb_host_ip: 127.0.0.1 +#get hostname from invetory +influxdb_hostname: "{{ (groups['influxdb_hosts']|default({}))[0] | default('localhost') }}" +#get ip address for given host +influxdb_host_ip: "{{ hostvars[influxdb_hostname].ansible_default_ipv4.address }}" -- cgit 1.2.3-korg