openstack/devstack
Code Issues Proposed changes

PKIZ is the default token provider

Browse Source 
Keystone changed the default token provider to PKIZ from PKI.

Change-Id: I56b975383ded450308a8fe01908b6e5549e7cd74
This commit is contained in:
Brant Knudson 2014-06-06 10:55:42 -05:00
parent 754c4408b3
commit 0b0cbd1378
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/keystone
View File

@ -56,7 +56,7 @@ KEYSTONE_ASSIGNMENT_BACKEND=${KEYSTONE_ASSIGNMENT_BACKEND:-sql}
# Select Keystone's token format # Select Keystone's token format
# Choose from 'UUID', 'PKI', or 'PKIZ' # Choose from 'UUID', 'PKI', or 'PKIZ'
KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI} KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKIZ}
# Set Keystone interface configuration # Set Keystone interface configuration
KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST} KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST}
@ -204,8 +204,8 @@ function configure_keystone {
if [[ "$KEYSTONE_TOKEN_FORMAT" = "UUID" ]]; then if [[ "$KEYSTONE_TOKEN_FORMAT" = "UUID" ]]; then
iniset $KEYSTONE_CONF token provider keystone.token.providers.uuid.Provider iniset $KEYSTONE_CONF token provider keystone.token.providers.uuid.Provider
elif [[ "$KEYSTONE_TOKEN_FORMAT" = "PKIZ" ]]; then elif [[ "$KEYSTONE_TOKEN_FORMAT" = "PKI" ]]; then
iniset $KEYSTONE_CONF token provider keystone.token.providers.pkiz.Provider iniset $KEYSTONE_CONF token provider keystone.token.providers.pki.Provider
fi fi
iniset $KEYSTONE_CONF database connection `database_connection_url keystone` iniset $KEYSTONE_CONF database connection `database_connection_url keystone`