From b805726ca1a702362922f1e4e25504bee6e52c1d Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 9 May 2019 11:53:09 +0100
Subject: [PATCH] Fix issues obtaining Keystone token with Monasca Grafana

When using the the default domain name there are issues authenticating
with Keystone. For example, you can only log in on the second attempt
and the Monasca datasource fails to authenticate. Switching to the
default domain id resolves these issues.

Change-Id: I2cb4b2608c74dd853c97e4fc27078930bc72fdf8
---
 ansible/roles/monasca/templates/monasca-grafana/grafana.ini.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/monasca/templates/monasca-grafana/grafana.ini.j2 b/ansible/roles/monasca/templates/monasca-grafana/grafana.ini.j2
index 6e6df704d9..5c7f4afbdf 100644
--- a/ansible/roles/monasca/templates/monasca-grafana/grafana.ini.j2
+++ b/ansible/roles/monasca/templates/monasca-grafana/grafana.ini.j2
@@ -48,7 +48,7 @@ admin_password = {{ monasca_grafana_admin_password }}
 [auth.keystone]
 enabled = true
 auth_url = {{ keystone_internal_url }}
-default_domain = {{ default_project_domain_name }}
+default_domain = {{ default_project_domain_id }}
 default_role = Viewer
 admin_roles = admin
 editor_roles = _member_