From ca73777e5424938ae9e1bb103761a4c94c595bd6 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Mon, 19 Feb 2018 17:17:44 +0000 Subject: [PATCH] Remove admin_user override in grafana.ini Setting the admin_user is now supported via Kolla. --- ansible/roles/kolla-openstack/templates/grafana.ini.j2 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ansible/roles/kolla-openstack/templates/grafana.ini.j2 b/ansible/roles/kolla-openstack/templates/grafana.ini.j2 index 526748ac5..d1c34be6a 100644 --- a/ansible/roles/kolla-openstack/templates/grafana.ini.j2 +++ b/ansible/roles/kolla-openstack/templates/grafana.ini.j2 @@ -1,14 +1,5 @@ # {{ ansible_managed }} -[security] -; If an OpenStack user with the same name as the admin user logs into -; Grafana it overwrites user data in the Grafana database, breaking -; the local admin account, and preventing admin API calls to Grafana. To -; reduce the chance of this happening we rename the local admin user here. -; Note that this only affects the Monasca fork of Grafana. -;admin_user = admin -admin_user = {{ grafana_local_admin_user_name }} - {% if kolla_extra_grafana %} ####################### # Extra configuration