...
|
...
|
@@ -150,12 +150,7 @@ function configure_heat {
|
150
|
150
|
iniset $HEAT_CONF paste_deploy flavor standalone
|
151
|
151
|
iniset $HEAT_CONF clients_heat url "http://$HEAT_API_HOST:$HEAT_API_PORT/v1/%(tenant_id)s"
|
152
|
152
|
else
|
153
|
|
- iniset $HEAT_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
|
154
|
|
- iniset $HEAT_CONF keystone_authtoken admin_user $HEAT_SERVICE_USER
|
155
|
|
- iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
|
156
|
|
- iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
|
157
|
|
- iniset $HEAT_CONF keystone_authtoken cafile $SSL_BUNDLE_FILE
|
158
|
|
- iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
|
|
153
|
+ configure_auth_token_middleware $HEAT_CONF heat $HEAT_AUTH_CACHE_DIR
|
159
|
154
|
fi
|
160
|
155
|
|
161
|
156
|
# If HEAT_DEFERRED_AUTH is unset or explicitly set to trusts, configure
|