openstack
/
rally-openstack
Code Issues Proposed changes

Fix use of keystone endpoint URL 

The OS_AUTH_URL variable is no longer used by devstack, it is setting
OS_CLOUD instead[0]. Use KEYSTONE_SERVICE_URI for the endpoint URL.

[0] https://review.opendev.org/c/openstack/devstack/+/780417

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: Ib0737feed3bd82e395bd157cc48dde4b418ac544
This commit is contained in:
Dr. Jens Harbott 2021-11-18 21:09:38 +01:00
parent a92ff92f67
commit 199186f96c
No known key found for this signature in database
GPG Key ID: E7862B245C3596B1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/rally
View File

@ -44,7 +44,7 @@ OSPROFILER_CONNECTION_STRING=${OSPROFILER_CONNECTION_STRING:-""}
# Uses the following variables: # Uses the following variables:
# #
# - ``ADMIN_PASSWORD``, ``REGION_NAME`` # - ``ADMIN_PASSWORD``, ``REGION_NAME``
# ``OS_AUTH_URL`` # ``KEYSTONE_SERVICE_URI``
# ``OSPROFILER_HMAC_KEYS`` - optional, for integration with osprofiler # ``OSPROFILER_HMAC_KEYS`` - optional, for integration with osprofiler
# ``OSPROFILER_CONNECTION_STRING`` - optional, if this is set together with # ``OSPROFILER_CONNECTION_STRING`` - optional, if this is set together with
# OSPROFILER_HMAC_KEYS rally html report will use osprofiler api to # OSPROFILER_HMAC_KEYS rally html report will use osprofiler api to
@ -58,7 +58,7 @@ function _create_deployment_config() {
cat >$1 <<EOF cat >$1 <<EOF
{ {
"openstack": { "openstack": {
"auth_url": "$OS_AUTH_URL", "auth_url": "$KEYSTONE_SERVICE_URI",
"region_name": "$REGION_NAME", "region_name": "$REGION_NAME",
"admin": { "admin": {
"username": "admin", "username": "admin",