openstack/devstack
Code Issues Proposed changes

Merge "Configurable token hashing algorithm"

Browse Source
This commit is contained in:
Jenkins 2014-09-22 19:05:08 +00:00 committed by Gerrit Code Review
commit 8fe3f70efd
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/horizon
View File

@ -112,6 +112,9 @@ function init_horizon {
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
_horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\""
if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
_horizon_config_set $local_settings "" OPENSTACK_TOKEN_HASH_ALGORITHM \""$KEYSTONE_TOKEN_HASH_ALGORITHM"\"
fi
if [ -f $SSL_BUNDLE_FILE ]; then
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"

7
lib/keystone
View File

@ -296,6 +296,10 @@ function configure_keystone {
iniset $KEYSTONE_CONF DEFAULT admin_workers "$API_WORKERS"
# Public workers will use the server default, typically number of CPU.
if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
iniset $KEYSTONE_CONF token hash_algorithm "$KEYSTONE_TOKEN_HASH_ALGORITHM"
fi
}
function configure_keystone_extensions {
@ -417,6 +421,9 @@ function configure_auth_token_middleware {
iniset $conf_file $section admin_user $admin_user
iniset $conf_file $section admin_password $SERVICE_PASSWORD
iniset $conf_file $section signing_dir $signing_dir
if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
iniset $conf_file keystone_authtoken hash_algorithms "$KEYSTONE_TOKEN_HASH_ALGORITHM"
fi
}
# init_keystone() - Initialize databases, etc.