From a23a4f151876a0969b2cdc9c68e8c8ae8020aa6d Mon Sep 17 00:00:00 2001 From: Artur Basiak Date: Fri, 21 Jul 2017 08:23:55 +0200 Subject: [PATCH] Add Keystone configuration for Grafana Add Keystone auth_url for Grafana configuration. Depends-On: I08195ad281637e6567a8acbace9862df2d5f9502 Change-Id: If65c94104c9951e4f4508247bd92449de949def1 --- devstack/files/grafana/grafana.ini | 1 + devstack/plugin.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/devstack/files/grafana/grafana.ini b/devstack/files/grafana/grafana.ini index 43ca1f8db..ef07ed4df 100644 --- a/devstack/files/grafana/grafana.ini +++ b/devstack/files/grafana/grafana.ini @@ -1,5 +1,6 @@ [auth.keystone] enabled = true +auth_url = '%KEYSTONE_AUTH_URI%' [paths] plugins = /var/lib/grafana/plugins diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 7433aee5a..18ebaf9eb 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1311,6 +1311,10 @@ function install_monasca_grafana { sudo chown -R grafana:grafana /var/lib/grafana /var/log/grafana sudo cp -f "${MONASCA_API_DIR}"/devstack/files/grafana/grafana.ini /etc/grafana/grafana.ini + sudo sed -e " + s|%KEYSTONE_AUTH_URI%|$KEYSTONE_AUTH_URI|g; + " -i /etc/grafana/grafana.ini + sudo cp -f "${MONASCA_API_DIR}"/devstack/files/grafana/grafana-server /etc/init.d/grafana-server sudo sed -i "s#/usr/sbin#"${MONASCA_BASE}"/grafana-build/src/github.com/grafana/grafana/bin#g" /etc/init.d/grafana-server sudo sed -i "s#/usr/share#"${MONASCA_BASE}"/grafana-build/src/github.com/grafana#g" /etc/init.d/grafana-server