openstack/devstack
Code Issues Proposed changes

Support option for Keystone PKIZ token provider

Browse Source 
Keystone added support for a compressed token provider, PKIZ. This
change adds support to devstack. Set the KEYSTONE_TOKEN_FORMAT
option to "PKIZ" to configure Keystone to use it.

Change-Id: I123eef661c85cc805e950f1179b48e885078d40f
This commit is contained in:
Brant Knudson 2014-06-04 09:06:01 -05:00
parent ea937baee6
commit 754c4408b3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/keystone
View File

@ -55,7 +55,7 @@ KEYSTONE_IDENTITY_BACKEND=${KEYSTONE_IDENTITY_BACKEND:-sql}
KEYSTONE_ASSIGNMENT_BACKEND=${KEYSTONE_ASSIGNMENT_BACKEND:-sql} KEYSTONE_ASSIGNMENT_BACKEND=${KEYSTONE_ASSIGNMENT_BACKEND:-sql}
# Select Keystone's token format # Select Keystone's token format
# Choose from 'UUID' and 'PKI' # Choose from 'UUID', 'PKI', or 'PKIZ'
KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI} KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI}
# Set Keystone interface configuration # Set Keystone interface configuration
@ -204,6 +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
iniset $KEYSTONE_CONF token provider keystone.token.providers.pkiz.Provider
fi fi
iniset $KEYSTONE_CONF database connection `database_connection_url keystone` iniset $KEYSTONE_CONF database connection `database_connection_url keystone`
@ -384,7 +386,7 @@ function init_keystone {
# Initialize keystone database # Initialize keystone database
$KEYSTONE_DIR/bin/keystone-manage db_sync $KEYSTONE_DIR/bin/keystone-manage db_sync
if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" || "$KEYSTONE_TOKEN_FORMAT" == "PKIZ" ]]; then
# Set up certificates # Set up certificates
rm -rf $KEYSTONE_CONF_DIR/ssl rm -rf $KEYSTONE_CONF_DIR/ssl
$KEYSTONE_DIR/bin/keystone-manage pki_setup $KEYSTONE_DIR/bin/keystone-manage pki_setup