Browse code

Mount identity admin script at /identity_admin

The /identity_admin endpoint is the port 80/443 equivalent of the
service that typically runs on port 35357. In v2 some operations must be
performed on the admin endpoint whereas on v3 the services on 5000 and
35357 are exactly the same. This would be why the service was mounted at
/identity_v2_admin however that is misleading because both the v2 and v3
services are present on that endpoint.

This is particularly confusing because we set this as the OS_AUTH_URL
endpoint and it makes it seem like we are doing v2 authentication when
we are not.

Change-Id: If73735026079fb19ca5bd44b3a4dc1f507b5c99d

Jamie Lennox authored on 2016/07/27 07:05:05
Showing 2 changed files
... ...
@@ -44,8 +44,8 @@ Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public
44 44
     WSGIPassAuthorization On
45 45
 </Location>
46 46
 
47
-Alias /identity_v2_admin %KEYSTONE_BIN%/keystone-wsgi-admin
48
-<Location /identity_v2_admin>
47
+Alias /identity_admin %KEYSTONE_BIN%/keystone-wsgi-admin
48
+<Location /identity_admin>
49 49
     SetHandler wsgi-script
50 50
     Options +ExecCGI
51 51
 
... ...
@@ -124,7 +124,7 @@ fi
124 124
 # complete URIs
125 125
 if [ "$KEYSTONE_DEPLOY" == "mod_wsgi" ]; then
126 126
     # If running in Apache, use path access rather than port.
127
-    KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity_v2_admin
127
+    KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity_admin
128 128
     KEYSTONE_SERVICE_URI=${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}/identity
129 129
 else
130 130
     KEYSTONE_AUTH_URI=${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_AUTH_PORT}