openstack/devstack
Code Issues Proposed changes

Merge "Support fernet token provider"

Browse Source
This commit is contained in:
Jenkins 2015-07-16 14:03:24 +00:00 committed by Gerrit Code Review
commit 474e96d02b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/keystone
View File

@ -313,6 +313,8 @@ function configure_keystone {
iniset $KEYSTONE_CONF eventlet_server admin_workers "$API_WORKERS" iniset $KEYSTONE_CONF eventlet_server admin_workers "$API_WORKERS"
# Public workers will use the server default, typically number of CPU. # Public workers will use the server default, typically number of CPU.
iniset $KEYSTONE_CONF fernet_tokens key_repository "$KEYSTONE_CONF_DIR/fernet-keys/"
} }
function configure_keystone_extensions { function configure_keystone_extensions {
@ -475,11 +477,15 @@ function init_keystone {
$KEYSTONE_BIN_DIR/keystone-manage db_sync --extension "${extension_value}" $KEYSTONE_BIN_DIR/keystone-manage db_sync --extension "${extension_value}"
done done
if [[ "$KEYSTONE_TOKEN_FORMAT" != "uuid" ]]; 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_BIN_DIR/keystone-manage pki_setup $KEYSTONE_BIN_DIR/keystone-manage pki_setup
fi fi
if [[ "$KEYSTONE_TOKEN_FORMAT" == "fernet" ]]; then
rm -rf "$KEYSTONE_CONF_DIR/fernet-keys/"
$KEYSTONE_BIN_DIR/keystone-manage fernet_setup
fi
} }
# install_keystoneclient() - Collect source and prepare # install_keystoneclient() - Collect source and prepare