diff options
| author | Luigi Toscano <ltoscano@redhat.com> | 2018-06-20 19:17:28 +0200 |
|---|---|---|
| committer | Luigi Toscano <ltoscano@redhat.com> | 2018-06-20 19:17:28 +0200 |
| commit | 21de8038dd5ea9af11c0c7b59daebebc2e723c2c (patch) | |
| tree | 8aae09381bab3495bb7f83a43ac988479957c5ca /devstack | |
| parent | 20cad2d3b50d710f318155603c802ec664fa8e2c (diff) | |
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
Notes
Notes (review):
Code-Review+1: Giulio Fidente <gfidente@redhat.com>
Code-Review+1: Jeremy Freudberg <jeremyfreudberg@gmail.com>
Code-Review+1: Rajat Sharma <rajat.sharma@india.nec.com>
Code-Review+2: Ramana Raja <rraja@redhat.com>
Code-Review+2: Tom Barron <tpb@dyncloud.net>
Workflow+1: Tom Barron <tpb@dyncloud.net>
Verified+2: Zuul
Submitted-by: Zuul
Submitted-at: Fri, 22 Jun 2018 12:21:52 +0000
Reviewed-on: https://review.openstack.org/576926
Project: openstack/devstack-plugin-ceph
Branch: refs/heads/master
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ceph | 2 |
1 files changed, 1 insertions, 1 deletions
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 { | |||
| 527 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw print continue" "false" | 527 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw print continue" "false" |
| 528 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw frontends" "civetweb port=${CEPH_RGW_PORT}" | 528 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw frontends" "civetweb port=${CEPH_RGW_PORT}" |
| 529 | 529 | ||
| 530 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone url" "http://${SERVICE_HOST}:35357" | 530 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone url" "$KEYSTONE_SERVICE_URI" |
| 531 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw s3 auth use keystone" "true" | 531 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw s3 auth use keystone" "true" |
| 532 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone admin user" "radosgw" | 532 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone admin user" "radosgw" |
| 533 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone admin password" "$SERVICE_PASSWORD" | 533 | iniset -sudo ${CEPH_CONF_FILE} ${key} "rgw keystone admin password" "$SERVICE_PASSWORD" |