From 0b0cbd1378e82015f683bbb2f35824dad424bb42 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Fri, 6 Jun 2014 10:55:42 -0500 Subject: [PATCH] PKIZ is the default token provider Keystone changed the default token provider to PKIZ from PKI. Change-Id: I56b975383ded450308a8fe01908b6e5549e7cd74 --- lib/keystone | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/keystone b/lib/keystone index 0bedaba68c..f2513de112 100644 --- a/lib/keystone +++ b/lib/keystone @@ -56,7 +56,7 @@ KEYSTONE_ASSIGNMENT_BACKEND=${KEYSTONE_ASSIGNMENT_BACKEND:-sql} # Select Keystone's token format # Choose from 'UUID', 'PKI', or 'PKIZ' -KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI} +KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKIZ} # Set Keystone interface configuration KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST} @@ -204,8 +204,8 @@ function configure_keystone { if [[ "$KEYSTONE_TOKEN_FORMAT" = "UUID" ]]; then iniset $KEYSTONE_CONF token provider keystone.token.providers.uuid.Provider - elif [[ "$KEYSTONE_TOKEN_FORMAT" = "PKIZ" ]]; then - iniset $KEYSTONE_CONF token provider keystone.token.providers.pkiz.Provider + elif [[ "$KEYSTONE_TOKEN_FORMAT" = "PKI" ]]; then + iniset $KEYSTONE_CONF token provider keystone.token.providers.pki.Provider fi iniset $KEYSTONE_CONF database connection `database_connection_url keystone`