From f08b9164c7351bca811de2bc5fb153285d1f5b9c Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 23 Jun 2020 14:51:04 -0400 Subject: [PATCH] Don't set RABBITMQ_SERVER_ERL_ARGS From the RabbitMQ docs[1]: "RABBITMQ_SERVER_ERL_ARGS - Standard parameters for the erl command used when invoking the RabbitMQ Server. This should be overridden for debugging purposes only. Overriding this variable replaces the default value." We do not need any of the current values because of this commit from 2015 in rabbitmq 3.5.4: https://github.com/rabbitmq/rabbitmq-server/commit/5c3c0e6f38792ca37289888ce39996e6baf4d846 In which the "+K true" and "-kernel inet_default_connect_options "[{nodelay,true}]" options were hard-coded to the rabbitmq-server script. Meanwhile the "+P 1048576" configuration was moved to the rabbitmq-env script under the SERVER_ERL_ARGS variable, which is the defaults used when RABBITMQ_SERVER_ERL_ARGS is unset. [1] https://www.rabbitmq.com/configure.html#supported-environment-variables Let's also move the current RabbitAdditionalErlArgs to a new dedicated override hiera key. NB: To get this properly working we need a puppet-rabbitmq that contains https://github.com/voxpupuli/puppet-rabbitmq/pull/841 Depends-On: I3bf244a70538209773804eb85fae6be035c587f4 Closes-Bug: #1884922 Change-Id: I567839785a72813a382a00253562894e19eb6715 (cherry picked from commit 938166b93b8fc525d575c53509f8364a8f3d04e5) --- deployment/rabbitmq/rabbitmq-container-puppet.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index d3506d836a..a1d07a99e2 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml @@ -139,11 +139,10 @@ outputs: NODE_PORT: '' NODE_IP_ADDRESS: '' RABBITMQ_NODENAME: "rabbit@%{::hostname}" - RABBITMQ_SERVER_ERL_ARGS: '"+K true +P 1048576 -kernel inet_default_connect_options [{nodelay,true}]"' - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS: {get_param: RabbitAdditionalErlArgs} RABBITMQ_CTL_DIST_PORT_MIN: '25673' RABBITMQ_CTL_DIST_PORT_MAX: '25683' 'export ERL_EPMD_ADDRESS': "%{hiera('rabbitmq::interface')}" + tripleo::profile::base::rabbitmq::additional_erl_args: {get_param: RabbitAdditionalErlArgs} rabbitmq_kernel_variables: inet_dist_listen_min: '25672' inet_dist_listen_max: '25672'