From db441a7ca605383613b9d850dcdf0880b15ea9e7 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 14 Oct 2020 22:49:48 +0200 Subject: [PATCH] Fix MetricsQdrUseSSL value puppet-qdr expects one of the string values 'yes'/'no' instead of boolean, so currently listeners cannot be created with SSL enabled. This patch is fixing this issue. Change-Id: I2dbafdc417f31eb000fbb469ae2c082cda3a5523 (cherry picked from commit dfc3322b637c62b85f450d2ad4aab0aaa1990cb7) --- deployment/metrics/qdr-container-puppet.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index fb3769133f..5a66b0c7d1 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -147,6 +147,7 @@ parameters: conditions: internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} + listener_ssl_enabled: {equals: [{get_param: MetricsQdrUseSSL}, true]} enable_stf: {equals: [{get_param: EnableSTF}, true]} @@ -201,7 +202,11 @@ outputs: tripleo::profile::base::metrics::qdr::addresses: {get_param: MetricsQdrAddresses} tripleo::profile::base::metrics::qdr::autolink_addresses: {get_param: MetricsQdrAutoLinks} # ssl support - tripleo::profile::base::metrics::qdr::listener_require_ssl: {get_param: MetricsQdrUseSSL} + tripleo::profile::base::metrics::qdr::listener_require_ssl: + if: + - listener_ssl_enabled + - 'yes' + - 'no' tripleo::profile::base::metrics::qdr::listener_require_encrypt: {get_param: MetricsQdrUseEncryption} tripleo::profile::base::metrics::qdr::listener_sasl_mech: {get_param: MetricsQdrSaslMechanisms} tripleo::profile::base::metrics::qdr::listener_ssl_cert_db: {get_param: MetricsQdrSslCertDb}