openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix MetricsQdrUseSSL value

Browse Source 
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
This commit is contained in:
Martin Magr 2020-10-14 22:49:48 +02:00
parent 837f8cbb06
commit dfc3322b63
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/metrics/qdr-container-puppet.yaml
View File

@ -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}