2 files changed, 14 insertions, 8 deletions

diff --git a/docker/ansible/roles/run_grafana/tasks/main.yml b/docker/ansible/roles/run_grafana/tasks/main.yml
index 97012495..d4a1638c 100644
--- a/docker/ansible/roles/run_grafana/tasks/main.yml
+++ b/docker/ansible/roles/run_grafana/tasks/main.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-21 Anuket, Intel Corporation and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,24 +25,28 @@
 - name: Remove barometer-grafana image
   docker_image:
     state: absent
-    name: opnfv/barometer-grafana
+    name: anuket/barometer-grafana
   tags:
     - rm_images
     - rm_grafana_image
   when: rm_images|default(false)|bool == true
 
+- name: Cleanup barometer-grafana cache directory under host
+  file:
+    path: /var/lib/grafana
+    state: absent
+  when: clean_grafana_cache|default(true)|bool == true
+
 - name: launch barometer-grafana container
   docker_container:
     name: bar-grafana
-    image: opnfv/barometer-grafana
+    image: anuket/barometer-grafana
     volumes:
        - /var/lib/grafana:/var/lib/grafana
     ports:
        - 3000:3000
     env:
-      "{{ influxdb_host }}": "{{ influxdb_hostname }}"
-    etc_hosts:
-      "{{ influxdb_hostname }}": "{{ influxdb_host_ip }}"
+      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 }}"