openstack
/
puppet-tripleo
Code Issues Proposed changes

Make sure that rabbitmq_cacert has 'undef' as a default. 

This is done so that the deployment does not fail if we do not pass any
rabbitmq:ssl_cacert key at all. This is needed on SSL (non TLS-E)
undercloud installations, see LP and related tht patch.

Change-Id: I4e9801ba3ced734e5aa3fa22df522fab0e84761a
Related-Bug: #1947776
This commit is contained in:
Michele Baldessari 2021-10-19 21:33:36 +02:00
parent 2131f65c98
commit a9e0ec90f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/rabbitmq.pp
View File

@ -50,7 +50,7 @@
#
# [*rabbitmq_cacert*]
# (Optional) When internal tls is enabled this should point to the CA file
# Defaults to hiera('rabbitmq::ssl_cacert')
# Defaults to hiera('rabbitmq::ssl_cacert', undef)
#
# [*verify_server_peer*]
# (Optional) Server verify peer
@ -130,7 +130,7 @@ class tripleo::profile::base::rabbitmq (
$additional_erl_args = undef,
$ssl_versions = ['tlsv1.2', 'tlsv1.3'],
$inter_node_ciphers = '',
$rabbitmq_cacert = hiera('rabbitmq::ssl_cacert'),
$rabbitmq_cacert = hiera('rabbitmq::ssl_cacert', undef),
$verify_server_peer = 'verify_none',
$verify_client_peer = 'verify_peer',
$inet_dist_interface = hiera('rabbitmq::interface', undef),