From 6a15818d62aedc33a69a3058ed19dd9b2da68e5c Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Wed, 20 Oct 2021 07:25:39 +0200
Subject: [PATCH] Fix auth_url setting for devstack

Keystone is dropping some variables in devstack, switch to using the
same variable for the auth_url that keystone is using instead of
trying to reconstruct it ourselves.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: I3f167b3ce699669addc5ef07c174ffb142c2c8cc
---
 devstack/plugin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 220562b1..0605f47e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -147,7 +147,7 @@ function configure_masakari {
 
     # Set os_privileged_user credentials (used for connecting nova service)
     iniset $MASAKARI_CONF DEFAULT os_privileged_user_name nova
-    iniset $MASAKARI_CONF DEFAULT os_privileged_user_auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity"
+    iniset $MASAKARI_CONF DEFAULT os_privileged_user_auth_url "$KEYSTONE_SERVICE_URI"
     iniset $MASAKARI_CONF DEFAULT os_privileged_user_password "$SERVICE_PASSWORD"
     iniset $MASAKARI_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
     iniset $MASAKARI_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
@@ -180,7 +180,7 @@ function configure_masakarimonitors {
         --namespace oslo.middleware \
         > $MASAKARI_MONITORS_CONF
 
-    iniset $MASAKARI_MONITORS_CONF api auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity"
+    iniset $MASAKARI_MONITORS_CONF api auth_url "$KEYSTONE_SERVICE_URI"
     iniset $MASAKARI_MONITORS_CONF api password "$SERVICE_PASSWORD"
     iniset $MASAKARI_MONITORS_CONF api project_name "$SERVICE_PROJECT_NAME"
     iniset $MASAKARI_MONITORS_CONF api username "$USERNAME"