Browse Source
Merge pull request #51 from andrew-vant/salt.d
Added recursive management of minion.d and master.d.master
Forrest
10 years ago
4 changed files with 8 additions and 6 deletions
salt/files/master → salt/files/master.d/_defaults.conf
View File
salt/files/minion → salt/files/minion.d/_defaults.conf
View File
+ 4
- 3
salt/master.sls
View File
| salt-master: | salt-master: | ||||
| pkg.installed: | pkg.installed: | ||||
| - name: {{ pkgs['salt-master'] }} | - name: {{ pkgs['salt-master'] }} | ||||
| file.managed: | |||||
| - name: /etc/salt/master.d/master.conf | |||||
| file.recurse: | |||||
| - name: /etc/salt/master.d | |||||
| - template: jinja | - template: jinja | ||||
| - source: salt://salt/files/master | |||||
| - source: salt://salt/files/master.d | |||||
| - clean: True | |||||
| service.running: | service.running: | ||||
| - enable: True | - enable: True | ||||
| - watch: | - watch: |
+ 4
- 3
salt/minion.sls
View File
| salt-minion: | salt-minion: | ||||
| pkg.installed: | pkg.installed: | ||||
| - name: {{ pkgs['salt-minion'] }} | - name: {{ pkgs['salt-minion'] }} | ||||
| file.managed: | |||||
| - name: /etc/salt/minion.d/minion.conf | |||||
| file.recurse: | |||||
| - name: /etc/salt/minion.d | |||||
| - template: jinja | - template: jinja | ||||
| - source: salt://salt/files/minion | |||||
| - source: salt://salt/files/minion.d | |||||
| - clean: True | |||||
| service.running: | service.running: | ||||
| - enable: True | - enable: True | ||||
| - watch: | - watch: |
Loading…