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

updated archlinux map.jinja, to install salt-zmq 

updated the map style without the base='default' parameter
This commit is contained in:
Niels Abspoel 2015-01-13 20:07:46 +01:00
parent d3b920f5c7
commit 7b4104cf6e
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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')) %}