Merge "Fix MetricsQdrUseSSL value" into stable/ussuri

openstack-archive · Jan 7, 2021 · f347aa0 · f347aa0
2 parents ffe4be7 + 8d18693
commit f347aa0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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}