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
This commit is contained in:
parent
4a1fd433e8
commit
96bd0f7ca6
|
@ -31,9 +31,9 @@ define packstack::amqp::enable_rabbitmq {
|
||||||
loopback_users => [],
|
loopback_users => [],
|
||||||
# FIXME: it's ugly to not to require client certs
|
# FIXME: it's ugly to not to require client certs
|
||||||
ssl_fail_if_no_peer_cert => true,
|
ssl_fail_if_no_peer_cert => true,
|
||||||
config_variables => {
|
config_ranch => false,
|
||||||
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
|
tcp_keepalive => true,
|
||||||
},
|
tcp_backlog => 128,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
class { '::rabbitmq':
|
class { '::rabbitmq':
|
||||||
|
@ -45,9 +45,9 @@ define packstack::amqp::enable_rabbitmq {
|
||||||
repos_ensure => false,
|
repos_ensure => false,
|
||||||
admin_enable => false,
|
admin_enable => false,
|
||||||
loopback_users => [],
|
loopback_users => [],
|
||||||
config_variables => {
|
config_ranch => false,
|
||||||
'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
|
tcp_keepalive => true,
|
||||||
},
|
tcp_backlog => 128,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue