openstack/devstack
Code Issues Proposed changes

Merge "Remove deprecated auth_plugin config"

Browse Source
This commit is contained in:
Jenkins
2016-06-15 22:27:54 +00:00
committed by Gerrit Code Review
parent 5fc597289b 9a0d1f90b8
commit 2fe6369e32
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/heat
View File

@@ -156,7 +156,7 @@ function configure_heat {
# If HEAT_DEFERRED_AUTH is unset or explicitly set to trusts, configure
# the section for the client plugin associated with the trustee
if [ -z "$HEAT_DEFERRED_AUTH" -o "trusts" == "$HEAT_DEFERRED_AUTH" ]; then
iniset $HEAT_CONF trustee auth_plugin password
iniset $HEAT_CONF trustee auth_type password
iniset $HEAT_CONF trustee auth_url $KEYSTONE_AUTH_URI
iniset $HEAT_CONF trustee username $HEAT_TRUSTEE_USER
iniset $HEAT_CONF trustee password $HEAT_TRUSTEE_PASSWORD