From a49e18a73f7b5203d8c40c4430905602aa957cbc Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Fri, 14 Apr 2017 14:31:19 +0200 Subject: [PATCH] Fix Grafana config file template to use variables Grafana session/provider_config property actually uses a static user and a static database name. If grafana_database_user and grafana_database_name default value is changed, the config generated will not be updated accordingly. Change-Id: I517daab5439ab1aef56a4b3a11104bd0717223bf Closes-Bug: #1682810 --- ansible/roles/grafana/templates/grafana.ini.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/grafana/templates/grafana.ini.j2 b/ansible/roles/grafana/templates/grafana.ini.j2 index 6128a48d19..fc6ab5976f 100644 --- a/ansible/roles/grafana/templates/grafana.ini.j2 +++ b/ansible/roles/grafana/templates/grafana.ini.j2 @@ -24,7 +24,7 @@ ssl_mode = disable [session] provider = mysql -provider_config = grafana:{{ grafana_database_password }}@tcp({{ grafana_database_address }})/grafana +provider_config = {{ grafana_database_user }}:{{ grafana_database_password }}@tcp({{ grafana_database_address }})/{{ grafana_database_name }} cookie_name = grafana_sess cookie_secure = false