Skip to content
Snippets Groups Projects
Commit 77522d6e authored by Seth House's avatar Seth House
Browse files

Merge pull request #81 from aboe76/use_lookup_map.jinja

Removed package_map lookup
parents 96b409fa 4dc00447
Branches
No related tags found
No related merge requests found
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
{% set salt = pillar.get('salt', {}) -%}
{% set cloud = salt.get('cloud', {}) -%}
......
{% set package_table = {
{% set pkgs = salt['grains.filter_by']({
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
......@@ -48,11 +48,6 @@
'config-path': '/usr/local/etc/salt',
'minion-service': 'salt_minion',
'master-service': 'salt_master',
'syndic-service': 'salt_syndic'}
} %}
{% if 'package_table' in pillar %}
{% set pkgs = pillar['package_table'] %}
{% elif grains['os'] in package_table %}
{% set pkgs = package_table[grains['os']] %}
{% endif %}
'syndic-service': 'salt_syndic'},
},
merge=salt['pillar.get']('salt:lookup'), base='default') %}
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
salt-master:
pkg.installed:
......
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
salt-minion:
pkg.installed:
......
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
ensure salt-ssh is installed:
pkg.installed:
......
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
salt-minion:
pkg.installed:
......
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
include:
- salt.master
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment