From 44ee7e307b49c5ee9e30ba380e36576189efdc34 Mon Sep 17 00:00:00 2001 From: liyingjun Date: Fri, 25 Dec 2015 10:32:14 +0800 Subject: [PATCH] Fix heat config when using keystone v3 Use configure_auth_token_middleware to generate keystone_authtoken section configration. Change-Id: I87e0e60afb958683add2aff2552d26cbf8c9e374 Closes-bug: #1300246 --- lib/heat | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/heat b/lib/heat index 3666776317..c15bbe2b0b 100644 --- a/lib/heat +++ b/lib/heat @@ -150,12 +150,7 @@ function configure_heat { iniset $HEAT_CONF paste_deploy flavor standalone iniset $HEAT_CONF clients_heat url "http://$HEAT_API_HOST:$HEAT_API_PORT/v1/%(tenant_id)s" else - iniset $HEAT_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI - iniset $HEAT_CONF keystone_authtoken admin_user $HEAT_SERVICE_USER - iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD - iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME - iniset $HEAT_CONF keystone_authtoken cafile $SSL_BUNDLE_FILE - iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR + configure_auth_token_middleware $HEAT_CONF heat $HEAT_AUTH_CACHE_DIR fi # If HEAT_DEFERRED_AUTH is unset or explicitly set to trusts, configure