openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Make the additional_erl_args change more independent"

Browse Source
This commit is contained in:
Zuul 2020-07-02 21:01:56 +00:00 committed by Gerrit Code Review
commit e20ad9c45a
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,