aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-02 18:07:32 +0000
committerGerrit Code Review <review@openstack.org>2016-12-02 18:07:32 +0000
commitf0348b0d7aed8985edc91b3ab9229891c598cfa5 (patch)
tree6f4c885404022b5819814c1ee5ff5c769dc32532 /puppet
parent67f7dc9fae17882595feb904841b724ea9c2ed71 (diff)
parent0f1022e8ee2c9e7bbe40ba905c15a40a27708df6 (diff)
Merge "Revert "Use FQDN for rabbitmq's nodename env variable""
Diffstat (limited to 'puppet')
-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 190487e0..b77e0a91 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'