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

Merge pull request #85 from aboe76/master 

fix #84 with same logic as dnsmasq-formula
This commit is contained in:
Nitin Madhok 2015-01-11 23:33:07 +05:30
parent 77522d6e56 acf5832f68
commit 9821a94104
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/map.jinja
View File

@ -1,4 +1,4 @@
{% set pkgs = salt['grains.filter_by']({
{% set map = {
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
@ -49,5 +49,10 @@
'minion-service': 'salt_minion',
'master-service': 'salt_master',
'syndic-service': 'salt_syndic'},
},
merge=salt['pillar.get']('salt:lookup'), base='default') %}
} %}
{% 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 %}