From 93b906d53ee457b3768c755615fc7c2395d26c85 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Thu, 26 Mar 2015 12:53:51 +1000 Subject: [PATCH] Always set the Heat deferred auth method Otherwise in standalone mode we use the new default of "trusts" which won't work. Change-Id: If18db711faf7810217af0a89d1e38590a94d8e5b Closes-bug: 1436631 --- lib/heat | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/heat b/lib/heat index c7abd3bb1c..0930776a58 100644 --- a/lib/heat +++ b/lib/heat @@ -124,6 +124,8 @@ function configure_heat { setup_colorized_logging $HEAT_CONF DEFAULT tenant user fi + iniset $HEAT_CONF DEFAULT deferred_auth_method $HEAT_DEFERRED_AUTH + # NOTE(jamielennox): heat re-uses specific values from 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 @@ -269,10 +271,6 @@ function create_heat_accounts { get_or_create_role "heat_stack_user" fi - if [[ $HEAT_DEFERRED_AUTH == trusts ]]; then - iniset $HEAT_CONF DEFAULT deferred_auth_method trusts - fi - if [[ "$HEAT_STACK_DOMAIN" == "True" ]]; then # 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