From 25c007636f7100a23e9f288f1d41dbaff5ee0265 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 24 Nov 2021 00:20:35 +0900 Subject: [PATCH] Remove redundant usage of is_ssl_enabled_service 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 --- devstack/lib/heat | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index d95e152668..a8271081af 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -191,15 +191,9 @@ function configure_heat { # Cloudformation API 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 - fi - - if is_ssl_enabled_service "nova" || is_service_enabled tls-proxy; then 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 fi