openstack/heat
Code Issues Proposed changes

Remove redundant usage of is_ssl_enabled_service

Browse Source 
The is_ssl_enabled_service function is kept for backword compatibility,
and now returns the same value as `is_service_enabled tls-proxy`
since [1] was merged.

[1] f3b2f4c85307b14f115a020f5eaf6c92026b55b4

Change-Id: I5a3311121e56a7cfaefb73be39d3f60809bafb06
This commit is contained in:
Takashi Kajinami 2021-11-24 00:20:35 +09:00
parent 213e6b1304
commit 25c007636f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/heat
View File

@ -191,15 +191,9 @@ function configure_heat {
# Cloudformation API # Cloudformation API
iniset $HEAT_CONF heat_api_cfn bind_port $HEAT_API_CFN_PORT iniset $HEAT_CONF heat_api_cfn bind_port $HEAT_API_CFN_PORT
if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then if is_service_enabled tls-proxy; then
iniset $HEAT_CONF clients_keystone ca_file $SSL_BUNDLE_FILE iniset $HEAT_CONF clients_keystone ca_file $SSL_BUNDLE_FILE
fi
if is_ssl_enabled_service "nova" || is_service_enabled tls-proxy; then
iniset $HEAT_CONF clients_nova ca_file $SSL_BUNDLE_FILE iniset $HEAT_CONF clients_nova ca_file $SSL_BUNDLE_FILE
fi
if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then
iniset $HEAT_CONF clients_cinder ca_file $SSL_BUNDLE_FILE iniset $HEAT_CONF clients_cinder ca_file $SSL_BUNDLE_FILE
fi fi