Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge remote-tracking branch 'origin/pr/47' 

Conflicts:
	salt/master.sls
	salt/minion.sls
This commit is contained in:
Seth House 2014-10-09 16:39:07 -06:00
parent 51e493e448 4675d68bd8
commit 1682df8592
5 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar.example
View File

@ -13,7 +13,7 @@ salt:
module_config:
test: True
test.foo: foo
test.bar:
test.bar:
- baz
- quo
test.baz:

3
salt/master.sls
View File

@ -4,12 +4,13 @@ salt-master:
pkg.installed:
- name: {{ pkgs['salt-master'] }}
file.recurse:
- name: /etc/salt/master.d
- name: {{ pkgs.get('config-path', '/etc/salt') }}/master.d
- template: jinja
- source: salt://salt/files/master.d
- clean: True
service.running:
- enable: True
- name: {{ pkgs.get('master-service', 'salt-master') }}
- watch:
- pkg: salt-master
- file: salt-master

3
salt/minion.sls
View File

@ -4,12 +4,13 @@ salt-minion:
pkg.installed:
- name: {{ pkgs['salt-minion'] }}
file.recurse:
- name: /etc/salt/minion.d
- name: {{ pkgs.get('config-path', '/etc/salt') }}/minion.d
- template: jinja
- source: salt://salt/files/minion.d
- clean: True
service.running:
- enable: True
- name: {{ pkgs.get('minion-service', 'salt-minion') }}
- watch:
- pkg: salt-minion
- file: salt-minion

72
salt/package-map.jinja
View File

@ -1,36 +1,44 @@
{% set package_table = {
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Ubuntu': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'CentOS': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Amazon': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Fedora': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'RedHat': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Gentoo': {'salt-master': 'app-admin/salt',
'salt-minion': 'app-admin/salt',
'salt-syndic': 'app-admin/salt',
'salt-cloud': 'app-admin/salt'},
'Arch': {'salt-master': 'salt',
'salt-minion': 'salt',
'salt-syndic': 'salt',
'salt-cloud': 'salt'}
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Ubuntu': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'CentOS': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Amazon': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Fedora': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'RedHat': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
'salt-cloud': 'salt-cloud'},
'Gentoo': {'salt-master': 'app-admin/salt',
'salt-minion': 'app-admin/salt',
'salt-syndic': 'app-admin/salt',
'salt-cloud': 'app-admin/salt'},
'Arch': {'salt-master': 'salt',
'salt-minion': 'salt',
'salt-syndic': 'salt',
'salt-cloud': 'salt'},
'FreeBSD': {'salt-master': 'py27-salt',
'salt-minion': 'py27-salt',
'salt-syndic': 'py27-salt',
'salt-cloud': 'py27-salt',
'config-path': '/usr/local/etc/salt',
'minion-service': 'salt_minion',
'master-service': 'salt_master',
'syndic-service': 'salt_syndic'}
} %}
{% if 'package_table' in pillar %}

4
salt/syndic.sls
View File

@ -9,7 +9,7 @@ salt-syndic:
service:
- running
- require:
- service: salt-master
- service: {{ pkgs.get('syndic-service', 'salt-master') }}
- watch:
- pkg: salt-master
- file: /etc/salt/master
- file: {{ pkgs.get('config-path', '/etc/salt') }}/master