x
/
packstack
Code Issues Proposed changes

Use rabbitmq parameters for tcp_listen_options 

Currently we are passing tcp_listen_options as part of config_variables.
However, puppet-rabbitmq creates this directive from specific options [1].
This is leading to configuring it twice with different options. This is
not valid for rabbitmq 3.8 which does not start if it detects it
configured twice.

[1] https://github.com/voxpupuli/puppet-rabbitmq/blob/master/templates/rabbitmq.config.erb#L34-L55

Change-Id: I22048b580fef254090c77f8ded58513b44e93c36
(cherry picked from commit 96bd0f7ca6)
This commit is contained in:
Alfredo Moralejo 2019-12-10 15:05:27 +01:00 committed by yatin
parent 372d12079b
commit bfd3214483
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/puppet/modules/packstack/manifests/amqp.pp
View File

@ -37,9 +37,9 @@ define packstack::amqp::enable_rabbitmq {
loopback_users => [],
# FIXME: it's ugly to not to require client certs
ssl_fail_if_no_peer_cert => true,
config_variables => {
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
},
config_ranch => false,
tcp_keepalive => true,
tcp_backlog => 128,
}
} else {
class { '::rabbitmq':
@ -51,9 +51,9 @@ define packstack::amqp::enable_rabbitmq {
repos_ensure => false,
admin_enable => false,
loopback_users => [],
config_variables => {
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
},
config_ranch => false,
tcp_keepalive => true,
tcp_backlog => 128,
}
}
}