openstack/deb-heat
Code Issues Proposed changes

Merge "Remove deprecated auth_plugin config"

Browse Source
This commit is contained in:
Jenkins 2016-06-22 06:03:39 +00:00 committed by Gerrit Code Review
commit a098924ce6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/heat
View File

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

2
install-guide/source/install-obs.rst
View File

@ -374,7 +374,7 @@ Install and configure components
[trustee] [trustee]
... ...
auth_plugin = password auth_type = password
auth_url = http://controller:35357 auth_url = http://controller:35357
username = heat username = heat
password = HEAT_PASS password = HEAT_PASS

2
install-guide/source/install-rdo.rst
View File

@ -374,7 +374,7 @@ Install and configure components
[trustee] [trustee]
... ...
auth_plugin = password auth_type = password
auth_url = http://controller:35357 auth_url = http://controller:35357
username = heat username = heat
password = HEAT_PASS password = HEAT_PASS

2
install-guide/source/install-ubuntu.rst
View File

@ -373,7 +373,7 @@ Install and configure components
[trustee] [trustee]
... ...
auth_plugin = password auth_type = password
auth_url = http://controller:35357 auth_url = http://controller:35357
username = heat username = heat
password = HEAT_PASS password = HEAT_PASS