openstack/devstack
Code Issues Proposed changes

Always set the Heat deferred auth method

Browse Source 
Otherwise in standalone mode we use the new default of "trusts"
which won't work.

Change-Id: If18db711faf7810217af0a89d1e38590a94d8e5b
Closes-bug: 1436631
This commit is contained in:
Angus Salkeld 2015-03-26 12:53:51 +10:00
parent 85c98b3e18
commit 93b906d53e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/heat
View File

@ -124,6 +124,8 @@ function configure_heat {
setup_colorized_logging $HEAT_CONF DEFAULT tenant user setup_colorized_logging $HEAT_CONF DEFAULT tenant user
fi fi
iniset $HEAT_CONF DEFAULT deferred_auth_method $HEAT_DEFERRED_AUTH
# NOTE(jamielennox): heat re-uses specific values from the # NOTE(jamielennox): heat re-uses specific values from the
# keystone_authtoken middleware group and so currently fails when using the # keystone_authtoken middleware group and so currently fails when using the
# auth plugin setup. This should be fixed in heat. Heat is also the only # auth plugin setup. This should be fixed in heat. Heat is also the only
@ -269,10 +271,6 @@ function create_heat_accounts {
get_or_create_role "heat_stack_user" get_or_create_role "heat_stack_user"
fi fi
if [[ $HEAT_DEFERRED_AUTH == trusts ]]; then
iniset $HEAT_CONF DEFAULT deferred_auth_method trusts
fi
if [[ "$HEAT_STACK_DOMAIN" == "True" ]]; then if [[ "$HEAT_STACK_DOMAIN" == "True" ]]; then
# Note we have to pass token/endpoint here because the current endpoint and # Note we have to pass token/endpoint here because the current endpoint and
# version negotiation in OSC means just --os-identity-api-version=3 won't work # version negotiation in OSC means just --os-identity-api-version=3 won't work