From 1d249ca96663e3c3828acf2f13cd79cbfe329c8c Mon Sep 17 00:00:00 2001
From: Kevin Tibi <kevintibi@hotmail.com>
Date: Wed, 16 May 2018 16:29:22 +0200
Subject: [PATCH] Fix Grafana config for extra conf

Previous change[1] of config for grafana introduced
new bugs.

[1]https://review.openstack.org/#/c/548291/

Change-Id: Ib62f0670003612073ff08f702febe81c753b72e5
---
 ansible/roles/grafana/tasks/config.yml          | 2 --
 ansible/roles/grafana/templates/grafana.json.j2 | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ansible/roles/grafana/tasks/config.yml b/ansible/roles/grafana/tasks/config.yml
index 4042721e6a..ab45d86d21 100644
--- a/ansible/roles/grafana/tasks/config.yml
+++ b/ansible/roles/grafana/tasks/config.yml
@@ -53,8 +53,6 @@
 
 - name: Copying over extra configuration file
   become: true
-  vars:
-    service_name: "{{ item.0 }}"
   template:
     src: "{{ item.path }}"
     dest: "{{ node_config_directory }}/grafana/{{ item.path | basename }}"
diff --git a/ansible/roles/grafana/templates/grafana.json.j2 b/ansible/roles/grafana/templates/grafana.json.j2
index 940159b18f..f8e54a4be2 100644
--- a/ansible/roles/grafana/templates/grafana.json.j2
+++ b/ansible/roles/grafana/templates/grafana.json.j2
@@ -12,7 +12,7 @@
             "source": "{{ container_config_directory }}/{{ plugin.path | basename }}",
             "dest": "/etc/grafana/{{ plugin.path | basename }}",
             "owner": "grafana",
-            "perm": "0600",
+            "perm": "0600"
         },
 {% endfor %}{% endif %}{% endif %}
         {