Merge "Option "auth_plugin" is deprecated."

This commit is contained in:
Jenkins 2016-01-06 18:23:21 +00:00 committed by Gerrit Code Review
commit 9f8cf83e69

View File

@ -421,7 +421,7 @@ function configure_auth_token_middleware {
local signing_dir=$3 local signing_dir=$3
local section=${4:-keystone_authtoken} local section=${4:-keystone_authtoken}
iniset $conf_file $section auth_plugin password iniset $conf_file $section auth_type password
iniset $conf_file $section auth_url $KEYSTONE_AUTH_URI iniset $conf_file $section auth_url $KEYSTONE_AUTH_URI
iniset $conf_file $section username $admin_user iniset $conf_file $section username $admin_user
iniset $conf_file $section password $SERVICE_PASSWORD iniset $conf_file $section password $SERVICE_PASSWORD