2
0

Merge pull request from andrew-vant/salt.d

Added recursive management of minion.d and master.d.
This commit is contained in:
Forrest 2014-10-06 09:15:53 -07:00
commit 05087a8d42
4 changed files with 8 additions and 6 deletions

View File

@ -3,10 +3,11 @@
salt-master:
pkg.installed:
- name: {{ pkgs['salt-master'] }}
file.managed:
- name: /etc/salt/master.d/master.conf
file.recurse:
- name: /etc/salt/master.d
- template: jinja
- source: salt://salt/files/master
- source: salt://salt/files/master.d
- clean: True
service.running:
- enable: True
- watch:

View File

@ -3,10 +3,11 @@
salt-minion:
pkg.installed:
- name: {{ pkgs['salt-minion'] }}
file.managed:
- name: /etc/salt/minion.d/minion.conf
file.recurse:
- name: /etc/salt/minion.d
- template: jinja
- source: salt://salt/files/minion
- source: salt://salt/files/minion.d
- clean: True
service.running:
- enable: True
- watch: