aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-02 09:41:28 +0000
committerGerrit Code Review <review@openstack.org>2016-12-02 09:41:28 +0000
commitcefb448de51186b2c9ec2e37715e668fc526ee3b (patch)
tree88fda4bfbff4f621ae2419a0db6a1c116aa3bf67
parent5aa0c861a49d2f1c2b8252e3b8295c44de972231 (diff)
parent3e9fcfd09320ace07bc1bd4cb57feb98cd057332 (diff)
Merge "Use FQDN for rabbitmq's nodename env variable"
-rw-r--r--puppet/services/rabbitmq.yaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index b77e0a91..190487e0 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -73,7 +73,13 @@ outputs:
rabbitmq::repos_ensure: false
rabbitmq::tcp_keepalive: true
rabbitmq_environment:
- RABBITMQ_NODENAME: "rabbit@%{::hostname}"
+ RABBITMQ_NODENAME:
+ str_replace:
+ template:
+ "rabbit@%{hiera('fqdn_$NETWORK')}"
+ params:
+ $NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
+ RABBITMQ_USE_LONGNAME: true
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'