openstack/devstack
Code Issues Proposed changes

remove $KEYSTONE_TOKEN_HASH_ALGORITHM

Browse Source 
Now that Keystone is back to UUID token defaults the use case for this
in devstack is extremely dubious, and it can be set through via
local.conf if anyone *really* cares.

Part of bp:devstack-nounset

Change-Id: I644b5b1579952959d253758b2a12b97d8a704657
This commit is contained in:
Sean Dague 2014-12-15 16:32:43 -05:00
parent 7f80280698
commit ef844fd08d
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/horizon
View File

@ -105,9 +105,6 @@ function init_horizon {
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\" _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\"" _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 if [ -f $SSL_BUNDLE_FILE ]; then
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\" _horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"

7
lib/keystone
View File

@ -318,10 +318,6 @@ function configure_keystone {
iniset $KEYSTONE_CONF DEFAULT admin_workers "$API_WORKERS" iniset $KEYSTONE_CONF DEFAULT 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.
if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
iniset $KEYSTONE_CONF token hash_algorithm "$KEYSTONE_TOKEN_HASH_ALGORITHM"
fi
} }
function configure_keystone_extensions { function configure_keystone_extensions {
@ -443,9 +439,6 @@ function configure_auth_token_middleware {
iniset $conf_file $section admin_user $admin_user iniset $conf_file $section admin_user $admin_user
iniset $conf_file $section admin_password $SERVICE_PASSWORD iniset $conf_file $section admin_password $SERVICE_PASSWORD
iniset $conf_file $section signing_dir $signing_dir 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. # init_keystone() - Initialize databases, etc.