openstack/devstack
Code Issues Proposed changes

Merge "Mount identity admin script at /identity_admin"

Browse Source
This commit is contained in:
Jenkins 2016-09-26 20:39:11 +00:00 committed by Gerrit Code Review
commit 792a7ab31f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/apache-keystone.template
View File

@ -44,8 +44,8 @@ Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public
WSGIPassAuthorization On WSGIPassAuthorization On
</Location> </Location>
Alias /identity_v2_admin %KEYSTONE_BIN%/keystone-wsgi-admin Alias /identity_admin %KEYSTONE_BIN%/keystone-wsgi-admin
<Location /identity_v2_admin> <Location /identity_admin>
SetHandler wsgi-script SetHandler wsgi-script
Options +ExecCGI Options +ExecCGI

2
lib/keystone
View File

@ -124,7 +124,7 @@ fi
# complete URIs # complete URIs
if [ "$KEYSTONE_DEPLOY" == "mod_wsgi" ]; then if [ "$KEYSTONE_DEPLOY" == "mod_wsgi" ]; then
# If running in Apache, use path access rather than port. # If running in Apache, use path access rather than port.
KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity_v2_admin KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity_admin
KEYSTONE_SERVICE_URI=${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity KEYSTONE_SERVICE_URI=${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity
else else
KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_AUTH_PORT} KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_AUTH_PORT}