Merge remote-tracking branch 'gaetanfl/cluster_strategy' into fretlink-fixes

diff --git a/templates/etc/rabbitmq/rabbitmq.config.j2 b/templates/etc/rabbitmq/rabbitmq.config.j2
index c2d836a5eb28212c8ad4ef9e80d284cf30bb9885..4d3e81c165be45e6e09db040c492b34677e64b8d 100644 (file)
--- a/templates/etc/rabbitmq/rabbitmq.config.j2
+++ b/templates/etc/rabbitmq/rabbitmq.config.j2
@@ -5,6 +5,9 @@
 {% elif rabbitmq_listeners is defined %}
    {tcp_listeners, [{% for item in rabbitmq_listeners %}{"{{ item }}", {{ rabbitmq_listen_port }}}{% if not loop.last %}, {% endif %}{% endfor %}]}
 {% endif %}
+{% if rabbitmq_cluster_partition_handling is defined %}
+   ,{cluster_partition_handling, {{ rabbitmq_cluster_partition_handling }}}
+{% endif %}
 {% if rabbitmq_ssl_enable %}
    ,
    {num_ssl_acceptors, 10},