From 21de8038dd5ea9af11c0c7b59daebebc2e723c2c Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Wed, 20 Jun 2018 19:17:28 +0200
Subject: [PATCH] Fix the Keystone authentication URL used by RadosGW

Simply use $KEYSTONE_SERVICE_URI, which is the value also
exported through OS_* variables.

Change-Id: I07296379fa691fed20ed5b1c53b335b2442a6c4e
---
 devstack/lib/ceph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 3b3ad4c..604728c 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -527,7 +527,7 @@ function _configure_rgw_ceph_section {
     iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw print continue" "false"
     iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw frontends" "civetweb port=${CEPH_RGW_PORT}"
 
-    iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone url" "http://${SERVICE_HOST}:35357"
+    iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone url" "$KEYSTONE_SERVICE_URI"
     iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw s3 auth use keystone" "true"
     iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone admin user" "radosgw"
     iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone admin password" "$SERVICE_PASSWORD"