auth_uri is not a keystonemiddleware option, and it's use in config
files is confusing at best. Remove it for clarity.
Change-Id: Ie3a9ab30d81809363444d5f3b41588b3889dc185
... | ... |
@@ -434,14 +434,13 @@ function configure_auth_token_middleware { |
434 | 434 |
local section=${4:-keystone_authtoken} |
435 | 435 |
|
436 | 436 |
iniset $conf_file $section auth_type password |
437 |
- iniset $conf_file $section auth_url $KEYSTONE_AUTH_URI |
|
437 |
+ iniset $conf_file $section auth_url $KEYSTONE_SERVICE_URI |
|
438 | 438 |
iniset $conf_file $section username $admin_user |
439 | 439 |
iniset $conf_file $section password $SERVICE_PASSWORD |
440 | 440 |
iniset $conf_file $section user_domain_name "$SERVICE_DOMAIN_NAME" |
441 | 441 |
iniset $conf_file $section project_name $SERVICE_PROJECT_NAME |
442 | 442 |
iniset $conf_file $section project_domain_name "$SERVICE_DOMAIN_NAME" |
443 | 443 |
|
444 |
- iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI |
|
445 | 444 |
iniset $conf_file $section cafile $SSL_BUNDLE_FILE |
446 | 445 |
iniset $conf_file $section signing_dir $signing_dir |
447 | 446 |
iniset $conf_file $section memcached_servers $SERVICE_HOST:11211 |