fwdriver: move rabbitmq.sls and rabbitMQ configuration to fwdriver module

salt/fwdriver/init.sls

@@ -3,6 +3,8 @@ include:
   - fwdriver.virtualenv
   - fwdriver.configuration
   - fwdriver.network
+  - fwdriver.rabbitmq
+
 
 disable_os_firewall:
   cmd.run:
@@ -44,6 +46,7 @@ firewall:
       - ntp
       - iptables
       - ipset
+      - rabbitmq-server
     - require:
       - user: {{ pillar['fwdriver']['user'] }}
     - require_in:

salt/manager/rabbitmq.sls → salt/fwdriver/rabbitmq.sls

@@ -33,6 +33,22 @@ virtual_host:
     - require:
       - service: rabbitmq-server
 
+rabbitmq_user_monitor:
+  rabbitmq_user.present:
+    - name: {{ pillar['graphite']['user'] }}
+    - password: {{ pillar['graphite']['password'] }}
+    - require:
+      - rabbitmq_vhost: virtual_host_monitor
+    - perms:
+      - {{ pillar['graphite']['vhost']}}:
+        - .*
+        - .*
+        - .*
+
+virtual_host_monitor:
+    rabbitmq_vhost.present:
+        - name: {{ pillar['graphite']['vhost']}}
+
 {% if pillar["deployment_mode"] == "node" %}
 open_amqp_port:
   cmd.run:
@@ -44,5 +60,4 @@ open_amqp_port:
     {% else %}
     - name: ufw allow 5672/tcp
     {% endif %}
-
 {% endif %}

salt/graphite/init.sls

 include:
-  - graphite.rabbitmq
   - graphite.virtualenv
   - graphite.configuration
 

salt/graphite/rabbitmq.sls

-rabbitmq-server_monitor:
-  pkg.installed:
-    - name: rabbitmq-server
-  service:
-    - running
-    - name: rabbitmq-server
-    - require:
-      - pkg: rabbitmq-server 
-
-rabbitmq_user_monitor:
-  rabbitmq_user.present:
-    - name: {{ pillar['graphite']['user'] }}
-    - password: {{ pillar['graphite']['password'] }}
-    - require:
-      - rabbitmq_vhost: virtual_host_monitor
-    - perms:
-      - {{ pillar['graphite']['vhost']}}:
-        - .*
-        - .*
-        - .*
-
-virtual_host_monitor:
-    rabbitmq_vhost.present:
-        - name: {{ pillar['graphite']['vhost']}}

salt/manager/init.sls

@@ -3,7 +3,6 @@ include:
   - manager.gitrepo
   - manager.agentgit
   - manager.postgres
-  - manager.rabbitmq
   - manager.virtualenv
   - manager.configuration
   - manager.nginx
@@ -15,7 +14,6 @@ manager:
       - git
       - python-pip
       - ntp
-      - rabbitmq-server
       - memcached
       - gettext
       - wget