Browse Source

updated archlinux map.jinja, to install salt-zmq

updated the map style without the base='default' parameter
master
Niels Abspoel 10 years ago
parent
commit
7b4104cf6e
1 changed files with 7 additions and 13 deletions
  1. +7
    -13
      salt/map.jinja

+ 7
- 13
salt/map.jinja View File

{% set map = {
{% set salt = salt['grains.filter_by']({
'Debian': {'salt-master': 'salt-master', 'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion', 'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic', 'salt-syndic': 'salt-syndic',
'salt-minion': 'app-admin/salt', 'salt-minion': 'app-admin/salt',
'salt-syndic': 'app-admin/salt', 'salt-syndic': 'app-admin/salt',
'salt-cloud': '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', 'openSUSE':{'salt-master': 'salt-master',
'salt-minion': 'salt-minion', 'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic', 'salt-syndic': 'salt-syndic',
'minion-service': 'salt_minion', 'minion-service': 'salt_minion',
'master-service': 'salt_master', 'master-service': 'salt_master',
'syndic-service': 'salt_syndic'}, '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')) %}

Loading…
Cancel
Save