From 10be09c5d62db1ca7423639df367c852a2adbaa3 Mon Sep 17 00:00:00 2001
From: Seth House <seth@eseth.com>
Date: Thu, 15 Aug 2013 19:49:43 -0600
Subject: [PATCH] Reworked external package-map to use filter_by()

---
 mysql/package-map.jinja | 72 ++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 52 deletions(-)

diff --git a/mysql/package-map.jinja b/mysql/package-map.jinja
index 6d35ebe..3a781cd 100644
--- a/mysql/package-map.jinja
+++ b/mysql/package-map.jinja
@@ -1,52 +1,20 @@
-{% set package_table = {
-    'Debian': {'mysql-server': 'mysql-server',
-               'mysql-client': 'mysql-client'},
-    'Ubuntu': {'mysql-server': 'mysql-server',
-               'mysql-client': 'mysql-client'},
-    'CentOS': {'mysql-server': 'mysql-server',
-               'mysql-client': 'mysql'},
-    'Fedora': {'mysql-server': 'mysql-server',
-               'mysql-client': 'mysql'},
-    'RedHat': {'mysql-server': 'mysql-server',
-               'mysql-client': 'mysql'},
-    'Gentoo': {'mysql-server': 'dev-db/mysql',
-               'mysql-client': 'dev-db/mysql'},
-} %}
-
-{% if 'package_table' in pillar %}
-    {% set pkgs = pillar['package_table'] %}
-{% elif grains['os'] in package_table %}
-    {% set pkgs = package_table[grains['os']] %}
-{% endif %}
-
-
-{% set service_table = {
-    'Debian': {'mysql': 'mysql'},
-    'Ubuntu': {'mysql': 'mysql'},
-    'CentOS': {'mysql': 'mysqld'},
-    'Fedora': {'mysql': 'mysqld'},
-    'RedHat': {'mysql': 'mysqld'},
-    'Gentoo': {'mysql': 'mysql'}
-} %}
-
-{% if 'service_table' in pillar %}
-    {% set services = pillar['service_table'] %}
-{% elif grains['os'] in service_table %}
-    {% set services = service_table[grains['os']] %}
-{% endif %}
-
-
-{% set config_table = {
-    'Debian': {'mysql': '/etc/mysql/my.cnf'},
-    'Ubuntu': {'mysql': '/etc/mysql/my.cnf'},
-    'CentOS': {'mysql': '/etc/my.cnf'},
-    'Fedora': {'mysql': '/etc/my.cnf'},
-    'RedHat': {'mysql': '/etc/my.cnf'},
-    'Gentoo': {'mysql': '/etc/mysql/my.cnf'}
-} %}
-
-{% if 'config_table' in pillar %}
-    {% set configs = pillar['config_table'] %}
-{% elif grains['os'] in config_table %}
-    {% set configs = config_table[grains['os']] %}
-{% endif %}
+{% set mysql = salt['grains.filter_by']({
+    'Debian': {
+        'server': 'mysql-server',
+        'client': 'mysql-client',
+        'service': 'mysql',
+        'config': '/etc/mysql/my.cnf',
+    },
+    'RedHat': {
+        'server': 'mysql-server',
+        'client': 'mysql',
+        'service': 'mysqld',
+        'config': '/etc/my.cnf',
+    },
+    'Gentoo': {
+        'server': 'dev-db/mysql',
+        'mysql-client': 'dev-db/mysql',
+        'service': 'mysql',
+        'config': '/etc/mysql/my.cnf',
+    },
+}, merge=salt['pillar.get']('mysql:lookup')) %}