Browse code

Merge "Mount identity admin script at /identity_admin"

Jenkins authored on 2016/09/27 05:39:11
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}