@@ -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