Merge pull request #105 from noelmcloughlin/queues

refactor(cluster): simplify cluster.clean and reorder config.init

Author: noelmcloughlin

rabbitmq/config/clean.sls

@@ -2,13 +2,13 @@
 # vim: ft=sls
 
 include:
-  - .users.clean
-  - .vhosts.clean
-  - .exchanges.clean
+  - .parameters.clean
+  - .policies.clean
   - .bindings.clean
+  - .exchanges.clean
   - .queues.clean
-  - .policies.clean
-  - .plugins.clean
-  - .parameters.clean
+  - .vhosts.clean
   - .clusters.clean
+  - .users.clean
+  - .plugins.clean
   - .files.clean

rabbitmq/config/clusters/clean.sls

@@ -5,9 +5,9 @@
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
     {%- for name, node in rabbitmq.nodes.items() %}
-        {%- if 'clustered' in node and node.clustered and 'join_node' in node %}
+        {%- if 'clustered' in node and node.clustered %}
 
-rabbitmq-config-clusters-{{ name }}-leave-{{ node.join_node }}:
+rabbitmq-config-clusters-{{ name }}-reset:
   cmd.run:
     - names:
       - /usr/sbin/rabbitmqctl --node {{ name }} stop_app || true

rabbitmq/config/init.sls

@@ -3,12 +3,12 @@
 
 include:
   - .files
-  - .clusters
-  - .users
   - .vhosts
+  - .users
   - .queues
   - .policies
   - .plugins
   - .exchanges
   - .bindings
   - .parameters
+  - .clusters

rabbitmq/config/queues/clean.sls

@@ -21,7 +21,9 @@ rabbitmq-config-queues-delete-{{ name }}-{{ queue }}:
     - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} delete queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} || true  # noqa 204
     - onlyif:
       - test -x /usr/local/sbin/rabbitmqadmin
+      - test -x /usr/sbin/rabbitmqctl
       - test -d {{ rabbitmq.dir.data }}
+      - /usr/sbin/rabbitmqctl --node {{ name }} --vhost={{ q.vhost }} list_queues | grep ^{{ queue }}\s*
     - runas: rabbitmq
     - require_in:
       - sls: {{ sls_config_plugins_clean }}

rabbitmq/config/queues/install.sls

@@ -26,6 +26,7 @@ rabbitmq-config-queues-enabled-{{ name }}-{{ queue }}:
       - sls: {{ sls_config_plugins }}
       - sls: {{ sls_config_users }}
       - sls: {{ sls_config_vhosts }}
+    - unless: /usr/sbin/rabbitmqctl --node {{ name }} --vhost={{ q.vhost }} list_queues | grep ^{{ queue }}\s*
 
             {%- endfor %}
         {%- endif %}

rabbitmq/config/users/install.sls

@@ -19,17 +19,17 @@ rabbitmq-config-users-added-{{ name }}-{{ user }}:
   cmd.run:
     - names:
       - {{ cmd }} --node {{ name }} add_user {{ user }} {{ u.password }} ||true
-          {%- if 'force' in u and u.force %}
+                {%- if 'force' in u and u.force %}
       - {{ cmd }} --node {{ name }} change_password {{ user }} {{ u.password }}
-          {%- endif %}
-          {%- if 'tags' in u and u.tags %}
+                {%- endif %}
+                {%- if 'tags' in u and u.tags %}
       - {{ cmd }} --node {{ name }} set_user_tags {{ user }} {{ u.tags|join(' ') }}   # noqa 204
-          {%- endif %}
-          {%- if 'perms' in u and u.perms %}
-              {%- for vhost, perms in u.perms.items() %}
+                {%- endif %}
+                {%- if 'perms' in u and u.perms %}
+                    {%- for vhost, perms in u.perms.items() %}
       - {{ cmd }} --node {{ name }} set_permissions -p {{ vhost }} {{ user }} {{ perms|map("json")|join(" ") }}  # noqa 204
-              {%- endfor %}
-          {%- endif %}
+                    {%- endfor %}
+                {%- endif %}
     - onlyif: test -x {{ cmd }}
     - runas: rabbitmq
     - require: