saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #90 from aboe76/master

Browse Source 
Updated map.jinja for archlinux package convention
This commit is contained in:
Nitin Madhok 2015-02-06 02:16:17 +05:30
commit f39fff2329
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pillar.example
View File

@ -1,4 +1,14 @@
salt:
# to overwrite map.jinja salt packages
lookup:
salt-master: 'salt-master'
salt-minion: 'salt-minion'
salt-syndic: 'salt-syndic'
salt-cloud: 'salt-cloud'
salt-ssh: 'salt-ssh'
# salt master config
master:
fileserver_backend:
- git
@ -9,6 +19,8 @@ salt:
file_roots:
base:
- /srv/salt
# salt minion config:
minion:
master: salt
fileserver_backend:
@ -29,6 +41,8 @@ salt:
test.baz:
spam: sausage
cheese: bread
# salt cloud config
cloud:
master: salt
folders:

20
salt/map.jinja
View File

@ -1,4 +1,4 @@
{% set map = {
{% set salt = salt['grains.filter_by']({
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
@ -33,11 +33,11 @@
'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',
'salt-ssh': 'salt'},
'Arch': {'salt-master': 'salt-zmq',
'salt-minion': 'salt-zmq',
'salt-syndic': 'salt-zmq',
'salt-cloud': 'salt-zmq',
'salt-ssh': 'salt-zmq'},
'openSUSE':{'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
@ -51,10 +51,4 @@
'minion-service': 'salt_minion',
'master-service': 'salt_master',
'syndic-service': 'salt_syndic'},
} %}
{% if grains.get('saltversion', '').startswith('0.17') %}
{% set salt= salt['grains.filter_by'](map, merge=salt['pillar.get']('salt:lookup'), base='default') %}
{% else %}
{% set salt = map.get(grains.os_family) %}
{% endif %}
}, merge=salt['pillar.get']('salt:lookup')) %}