Make cluster init less ugly
diff --git a/rabbitmq/cluster.sls b/rabbitmq/cluster.sls
index ba781f9..b5aaa1b 100644
--- a/rabbitmq/cluster.sls
+++ b/rabbitmq/cluster.sls
@@ -7,11 +7,12 @@
{% if cluster.get('role', 'slave') == 'master' %}
-rabbitmq_cluster_init:
+rabbitmq_cluster_name:
cmd.run:
- - names:
- - rabbitmqctl set_cluster_name {{ cluster.get('name', 'rabbitmq') }}
- - unless: test -e /var/lib/rabbitmq/.cluster-installed
+ - name: >
+ rabbitmqctl set_cluster_name {{ cluster.get('name', 'rabbitmq') }} &&
+ echo "{{ cluster.get('name', 'rabbitmq') }}" > /var/lib/rabbitmq/.cluster_name
+ - creates: /var/lib/rabbitmq/.cluster_name
- require:
- service: rabbitmq_service
@@ -29,12 +30,4 @@
{%- endif %}
-rabbitmq_cluster_init_final:
- cmd.run:
- - names:
- - touch /var/lib/rabbitmq/.cluster-installed
- - unless: test -e /var/lib/rabbitmq/.cluster-installed
- - require:
- - service: rabbitmq_service
-
{%- endif %}