Merge pull request #102 from noelmcloughlin/next

fix(formula): fix exchanges and bindings

Author: noelmcloughlin

rabbitmq/config/bindings/clean.sls

@@ -22,7 +22,6 @@ rabbitmq-config-bindings-delete-{{ name }}-{{ binding }}:
     - onlyif:
       - test -x /usr/local/sbin/rabbitmqadmin
       - test -d {{ rabbitmq.dir.data }}
-      # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
     - runas: rabbitmq
     - require_in:
       - sls: {{ sls_config_plugins_clean }}

rabbitmq/config/bindings/install.sls

@@ -19,9 +19,7 @@ include:
 rabbitmq-config-bindings-enabled-{{ name }}-{{ binding }}:
   cmd.run:
     - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare binding --vhost={{ b.vhost }} --username={{ b.user }} --password={{ b.passwd }} source={{ b.source }} destination={{ b.destination }} destination_type={{ b.destination_type }} routing_key={{ b.routing_key }} # noqa 204
-    - onlyif:
-        - test -x /usr/local/sbin/rabbitmqadmin
-        - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
+    - onlyif: test -x /usr/local/sbin/rabbitmqadmin
     - runas: rabbitmq
     - require:
       - sls: {{ sls_config_plugins }}

rabbitmq/config/exchanges/clean.sls

@@ -22,7 +22,6 @@ rabbitmq-config-exchanges-delete-{{ name }}-{{ exchange }}:
     - onlyif:
       - test -x /usr/local/sbin/rabbitmqadmin
       - test -d {{ rabbitmq.dir.data }}
-      - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
     - runas: rabbitmq
     - require_in:
       - {{ sls_config_users_clean }}

rabbitmq/config/exchanges/install.sls

@@ -20,9 +20,7 @@ rabbitmq-config-exchanges-enabled-{{ name }}-{{ exchange }}:
   cmd.run:
     - name: >-
             /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare exchange --vhost={{ ex.vhost }} --username={{ ex.user }} --password={{ ex.passwd }} name={{ exchange }} type={{ ex.type }} durable={{ ex.durable }} internal={{ ex.internal }} auto_delete={{ ex.auto_delete }} arguments='{{ "{}" if "arguments" not in ex else ex.arguments|json }}'  # noqa 204
-    - onlyif:
-        - test -x /usr/local/sbin/rabbitmqadmin
-        - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
+    - onlyif: test -x /usr/local/sbin/rabbitmqadmin
     - runas: rabbitmq
     - require:
       - sls: {{ sls_config_plugins }}

rabbitmq/config/plugins/install.sls

@@ -27,8 +27,8 @@ rabbitmq-config-plugins-enabled-{{ name }}-{{ plugin }}:
 rabbitmq-config-plugins-{{ name }}-rabbitmqadmin-install:
   cmd.run:
     - name : curl -k -L http://localhost:15672/cli/rabbitmqadmin -o /usr/local/sbin/rabbitmqadmin
-    - unless: test -x /usr/local/bin/rabbitmqadmin
-    - onlyif: /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled {{ plugin }}
+    - unless: test -x /usr/local/sbin/rabbitmqadmin
+    - onlyif: /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
     - require:
       - sls: {{ sls_service_running }}
   file.managed:

rabbitmq/config/queues/clean.sls

@@ -22,7 +22,6 @@ rabbitmq-config-queues-disabled-{{ name }}-{{ queue }}:
     - onlyif:
       - test -x /usr/local/sbin/rabbitmqadmin
       - test -d {{ rabbitmq.dir.data }}
-      # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
     - runas: rabbitmq
     - require_in:
       - sls: {{ sls_config_plugins_clean }}

rabbitmq/config/queues/install.sls

@@ -20,9 +20,7 @@ rabbitmq-config-queues-enabled-{{ name }}-{{ queue }}:
   cmd.run:
     - name: >-
             /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }} arguments='{{ "{}" if "arguments" not in q else q.arguments|json }}'  # noqa 204
-    - onlyif:
-        - test -x /usr/local/sbin/rabbitmqadmin
-        # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
+    - onlyif: test -x /usr/local/sbin/rabbitmqadmin
     - runas: rabbitmq
     - require:
       - sls: {{ sls_config_plugins }}

rabbitmq/files/default/systemd.ini.jinja

@@ -2,7 +2,7 @@
 # File managed by Salt. Changes risk being overwritten.
 #########################################################
 [Unit]
-Description=RabbitMQ Broker {{ '' if name is not defined or name else name }}
+Description=RabbitMQ broker {{ '' if name is not defined or name else name }}
 Wants=network-online.target
 After=syslog.target network.target