Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
salt
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
17
Merge Requests
1
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7671df8d
authored
Jul 07, 2016
by
Czémán Arnold
Committed by
cloud
Feb 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fwdriver: move rabbitmq.sls and rabbitMQ configuration to fwdriver module
parent
16c0a39c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
28 deletions
+19
-28
salt/fwdriver/init.sls
+3
-0
salt/fwdriver/rabbitmq.sls
+16
-1
salt/graphite/init.sls
+0
-1
salt/graphite/rabbitmq.sls
+0
-24
salt/manager/init.sls
+0
-2
No files found.
salt/fwdriver/init.sls
View file @
7671df8d
...
@@ -3,6 +3,8 @@ include:
...
@@ -3,6 +3,8 @@ include:
- fwdriver.virtualenv
- fwdriver.virtualenv
- fwdriver.configuration
- fwdriver.configuration
- fwdriver.network
- fwdriver.network
- fwdriver.rabbitmq
disable_os_firewall:
disable_os_firewall:
cmd.run:
cmd.run:
...
@@ -45,6 +47,7 @@ firewall:
...
@@ -45,6 +47,7 @@ firewall:
- ntp
- ntp
- iptables
- iptables
- ipset
- ipset
- rabbitmq-server
- require:
- require:
- user: {{ pillar['fwdriver']['user'] }}
- user: {{ pillar['fwdriver']['user'] }}
- require_in:
- require_in:
...
...
salt/
manag
er/rabbitmq.sls
→
salt/
fwdriv
er/rabbitmq.sls
View file @
7671df8d
...
@@ -33,6 +33,22 @@ virtual_host:
...
@@ -33,6 +33,22 @@ virtual_host:
- require:
- require:
- service: rabbitmq-server
- 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" %}
{% if pillar["deployment_mode"] == "node" %}
open_amqp_port:
open_amqp_port:
cmd.run:
cmd.run:
...
@@ -44,5 +60,4 @@ open_amqp_port:
...
@@ -44,5 +60,4 @@ open_amqp_port:
{% else %}
{% else %}
- name: ufw allow 5672/tcp
- name: ufw allow 5672/tcp
{% endif %}
{% endif %}
{% endif %}
{% endif %}
salt/graphite/init.sls
View file @
7671df8d
include:
include:
- graphite.rabbitmq
- graphite.virtualenv
- graphite.virtualenv
- graphite.configuration
- graphite.configuration
...
...
salt/graphite/rabbitmq.sls
deleted
100644 → 0
View file @
16c0a39c
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
View file @
7671df8d
...
@@ -3,7 +3,6 @@ include:
...
@@ -3,7 +3,6 @@ include:
- manager.gitrepo
- manager.gitrepo
- manager.agentgit
- manager.agentgit
- manager.postgres
- manager.postgres
- manager.rabbitmq
- manager.virtualenv
- manager.virtualenv
- manager.configuration
- manager.configuration
- manager.nginx
- manager.nginx
...
@@ -14,7 +13,6 @@ manager:
...
@@ -14,7 +13,6 @@ manager:
- postgresql
- postgresql
- git
- git
- ntp
- ntp
- rabbitmq-server
- memcached
- memcached
- gettext
- gettext
- wget
- wget
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment