Browse code

remove $KEYSTONE_TOKEN_HASH_ALGORITHM

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

Sean Dague authored on 2014/12/16 06:32:43
Showing 2 changed files
... ...
@@ -105,9 +105,6 @@ function init_horizon {
105 105
 
106 106
     _horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
107 107
     _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\""
108
-    if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
109
-        _horizon_config_set $local_settings "" OPENSTACK_TOKEN_HASH_ALGORITHM \""$KEYSTONE_TOKEN_HASH_ALGORITHM"\"
110
-    fi
111 108
 
112 109
     if [ -f $SSL_BUNDLE_FILE ]; then
113 110
         _horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"
... ...
@@ -318,10 +318,6 @@ function configure_keystone {
318 318
 
319 319
     iniset $KEYSTONE_CONF DEFAULT admin_workers "$API_WORKERS"
320 320
     # Public workers will use the server default, typically number of CPU.
321
-
322
-    if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
323
-        iniset $KEYSTONE_CONF token hash_algorithm "$KEYSTONE_TOKEN_HASH_ALGORITHM"
324
-    fi
325 321
 }
326 322
 
327 323
 function configure_keystone_extensions {
... ...
@@ -443,9 +439,6 @@ function configure_auth_token_middleware {
443 443
     iniset $conf_file $section admin_user $admin_user
444 444
     iniset $conf_file $section admin_password $SERVICE_PASSWORD
445 445
     iniset $conf_file $section signing_dir $signing_dir
446
-    if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then
447
-        iniset $conf_file keystone_authtoken hash_algorithms "$KEYSTONE_TOKEN_HASH_ALGORITHM"
448
-    fi
449 446
 }
450 447
 
451 448
 # init_keystone() - Initialize databases, etc.