From 38d4782c9f6b8558fea2c5268b9bf5de5070a0fe Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 19 Apr 2017 16:12:00 -0400 Subject: [PATCH] remove auth_uri from keystonemiddleware config 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 --- lib/keystone | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/keystone b/lib/keystone index a26ef8afd2..75a06791de 100644 --- a/lib/keystone +++ b/lib/keystone @@ -434,14 +434,13 @@ function configure_auth_token_middleware { local section=${4:-keystone_authtoken} iniset $conf_file $section auth_type password - iniset $conf_file $section auth_url $KEYSTONE_AUTH_URI + iniset $conf_file $section auth_url $KEYSTONE_SERVICE_URI iniset $conf_file $section username $admin_user iniset $conf_file $section password $SERVICE_PASSWORD iniset $conf_file $section user_domain_name "$SERVICE_DOMAIN_NAME" iniset $conf_file $section project_name $SERVICE_PROJECT_NAME iniset $conf_file $section project_domain_name "$SERVICE_DOMAIN_NAME" - iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI iniset $conf_file $section cafile $SSL_BUNDLE_FILE iniset $conf_file $section signing_dir $signing_dir iniset $conf_file $section memcached_servers $SERVICE_HOST:11211