Merge "add node type option to rabbitmq clustering"

2017-05-19 00:53:28 +00:00
parent c2397e1bc9 1ba7c271df
commit 671bcdaf17
3 changed files with 3 additions and 0 deletions
--- a/rabbitmq/templates/etc/_rabbitmq-env.conf.tpl
+++ b/rabbitmq/templates/etc/_rabbitmq-env.conf.tpl
@@ -19,3 +19,4 @@ AUTOCLUSTER_DELAY={{ .Values.autocluster.delay }}
 RABBITMQ_USE_LONGNAME=true
 AUTOCLUSTER_LOG_LEVEL={{ .Values.autocluster.log_level }}
 NODENAME="rabbit@${RABBITMQ_POD_IP}"
+RABBITMQ_NODE_TYPE={{ .Values.autocluster.node_type }}
--- a/rabbitmq/templates/etc/_rabbitmq.config.tpl
+++ b/rabbitmq/templates/etc/_rabbitmq.config.tpl
@@ -36,6 +36,7 @@
     ,{etcd_scheme, http}
     ,{etcd_host, {{ .Values.endpoints.etcd.hosts.default }}}
     ,{etcd_port, {{ .Values.endpoints.etcd.port }}}
+     ,{node_type, {{ .Values.autocluster.node_type }} }
   ]}
 ].
 % EOF
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -69,6 +69,7 @@ endpoints:
 autocluster:
  log_level: info
  delay: 15
+  node_type: disc

 probes_delay: 180
 probes_timeout: 10