aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/rabbitmq.yaml
diff options
context:
space:
mode:
authorBen Nemec <openstack@nemebean.com>2016-12-02 15:45:21 +0000
committerBen Nemec <openstack@nemebean.com>2016-12-02 15:45:21 +0000
commit0f1022e8ee2c9e7bbe40ba905c15a40a27708df6 (patch)
treebdcd22155d67505bb50d5bbfacb685b4fde4ecc6 /puppet/services/rabbitmq.yaml
parent3e9fcfd09320ace07bc1bd4cb57feb98cd057332 (diff)
Revert "Use FQDN for rabbitmq's nodename env variable"
This seems to have broken the updates job, causing it to fail with following error: Can't set long node name!\nPlease check your configuration\n Related-Bug: 1646873 This reverts commit 3e9fcfd09320ace07bc1bd4cb57feb98cd057332. Change-Id: I72ba891cd9cd8c4f1bc204144f46aaabbdfd3647
Diffstat (limited to 'puppet/services/rabbitmq.yaml')
-rw-r--r--puppet/services/rabbitmq.yaml8
1 files changed, 1 insertions, 7 deletions
diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 8db84fd..44a09a4 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -73,13 +73,7 @@ outputs:
rabbitmq::repos_ensure: false
rabbitmq::tcp_keepalive: true
rabbitmq_environment:
- RABBITMQ_NODENAME:
- str_replace:
- template:
- "rabbit@%{hiera('fqdn_$NETWORK')}"
- params:
- $NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
- RABBITMQ_USE_LONGNAME: true
+ RABBITMQ_NODENAME: "rabbit@%{::hostname}"
RABBITMQ_SERVER_ERL_ARGS: '"+K true +P 1048576 -kernel inet_default_connect_options [{nodelay,true},{raw,6,18,<<5000:64/native>>}] -kernel inet_default_listen_options [{raw,6,18,<<5000:64/native>>}]"'
rabbitmq_kernel_variables:
inet_dist_listen_min: '25672'