From 4dc0044772fd96118e59a2656dae88ff11b97e3d Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe76@gmail.com>
Date: Wed, 7 Jan 2015 21:06:02 +0100
Subject: [PATCH] update use_lookup_map with merges from upstream

---
 salt/package-map.jinja | 58 ------------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 salt/package-map.jinja

diff --git a/salt/package-map.jinja b/salt/package-map.jinja
deleted file mode 100644
index 770de38..0000000
--- a/salt/package-map.jinja
+++ /dev/null
@@ -1,58 +0,0 @@
-{% set package_table = {
-    'Debian':  {'salt-master': 'salt-master',
-                'salt-minion': 'salt-minion',
-                'salt-syndic': 'salt-syndic',
-                'salt-cloud': 'salt-cloud',
-                'salt-ssh': 'salt-ssh'},
-    'Ubuntu':  {'salt-master': 'salt-master',
-                'salt-minion': 'salt-minion',
-                'salt-syndic': 'salt-syndic',
-                'salt-cloud': 'salt-cloud',
-                'salt-ssh': 'salt-ssh'},
-    'CentOS':  {'salt-master': 'salt-master',
-                'salt-minion': 'salt-minion',
-                'salt-syndic': 'salt-syndic',
-                'salt-cloud': 'salt-cloud',
-                'salt-ssh': 'salt-ssh'},
-    'Amazon':  {'salt-master': 'salt-master',
-                'salt-minion': 'salt-minion',
-                'salt-syndic': 'salt-syndic',
-                'salt-cloud': 'salt-cloud',
-                'salt-ssh': 'salt-ssh'},
-    'Fedora':  {'salt-master': 'salt-master',
-                'salt-minion': 'salt-minion',
-                'salt-syndic': 'salt-syndic',
-                'salt-cloud': 'salt-cloud',
-                'salt-ssh': 'salt-ssh'},
-    'RedHat':  {'salt-master': 'salt-master',
-                'salt-minion': 'salt-minion',
-                'salt-syndic': 'salt-syndic',
-                'salt-cloud': 'salt-cloud',
-                'salt-ssh': 'salt-ssh'},
-    'Gentoo':  {'salt-master': 'app-admin/salt',
-                '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'},
-    'openSUSE':{'salt-master': 'salt-master',
-                'salt-minion':  'salt-minion',
-                'salt-syndic':  'salt-syndic',
-                'salt-cloud':  'salt-cloud'},
-    'FreeBSD': {'salt-master': 'py27-salt',
-                'salt-minion': 'py27-salt',
-                'salt-syndic': 'py27-salt',
-                'salt-cloud': 'py27-salt',
-                '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 %}