openstack/puppet-tripleo
Code Issues Proposed changes

Make the additional_erl_args change more independent

Browse Source 
In I3bf244a70538209773804eb85fae6be035c587f4 we made sure that
we use the additional_erl_args to define parameters. This all
works well but it requires the corresponding THT change
(I567839785a72813a382a00253562894e19eb6715). Let's make it so
that we can merge all the puppet changes without mandating the
THT change at the same time. This makes things easier when backporting.

Tested by deploying a queens environment with this change,
puppet-rabbitmq from master and correctly got a working rabbitmq
cluster. (I.e. we avoided deploying with the corresponding THT change)

Change-Id: I9fa9ba95410ed3994f608beb2c5e1578dc3a7c7a
Related-Bug: #1884922
This commit is contained in:
Michele Baldessari 2020-06-30 17:25:10 +02:00
parent c63bb348aa
commit cfc20b287f
1 changed files with 5 additions and 1 deletions

6
manifests/profile/base/rabbitmq.pp

@ -158,7 +158,11 @@ class tripleo::profile::base::rabbitmq (
# Historically in THT the default value of RabbitAdditionalErlArgs was "'+sbwt none'", we
# want to strip leading and trailing ' chars.
$additional_erl_args_real = regsubst($additional_erl_args, "(^'|'$)", '', 'G')
if $additional_erl_args != undef {
$additional_erl_args_real = regsubst($additional_erl_args, "(^'|'$)", '', 'G')
} else {
$additional_erl_args_real = ''
}
$rabbitmq_additional_erl_args = "\"${cert_option} ${key_option} ${ciphers_option} ${secure_renegotiate} ${additional_erl_args_real}\""
$environment_real = merge($environment, {
'RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS' => $rabbitmq_additional_erl_args,