Merge pull request #81 from aboe76/use_lookup_map.jinja

Removed package_map lookup

salt/cloud.sls

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

salt/package-map.jinja → salt/map.jinja

-{% set package_table = {
+{% set pkgs = salt['grains.filter_by']({
     'Debian':  {'salt-master': 'salt-master',
                 'salt-minion': 'salt-minion',
                 'salt-syndic': 'salt-syndic',
                 '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') %}

salt/master.sls

-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 salt-master:
   pkg.installed:

salt/minion.sls

-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 salt-minion:
   pkg.installed:

salt/ssh.sls

-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 ensure salt-ssh is installed:
   pkg.installed:

salt/standalone.sls

-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 salt-minion:
   pkg.installed:

salt/syndic.sls

-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 include:
   - salt.master