diff --git a/mysql/package-map.jinja b/mysql/package-map.jinja index 3a781cd..880ff67 100644 --- a/mysql/package-map.jinja +++ b/mysql/package-map.jinja @@ -4,17 +4,20 @@ 'client': 'mysql-client', 'service': 'mysql', 'config': '/etc/mysql/my.cnf', + 'python': 'python-mysqldb', }, 'RedHat': { 'server': 'mysql-server', 'client': 'mysql', 'service': 'mysqld', 'config': '/etc/my.cnf', + 'python': 'MySQL-python', }, 'Gentoo': { 'server': 'dev-db/mysql', 'mysql-client': 'dev-db/mysql', 'service': 'mysql', 'config': '/etc/mysql/my.cnf', + 'python': 'dev-python/mysql-python', }, }, merge=salt['pillar.get']('mysql:lookup')) %} diff --git a/mysql/python.sls b/mysql/python.sls index 12a27cb..bea5b6c 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -1,9 +1,6 @@ -{% set pkg = salt['grains.filter_by']({ - 'Debian': {'name': 'python-mysqldb'}, - 'RedHat': {'name': 'MySQL-python'}, -}) %} +{% from "mysql/package-map.jinja" import mysql with context %} mysqldb-python: pkg: - installed - - name: {{ pkg.name }} + - name: {{ mysql.python }} diff --git a/pillar.example b/pillar.example index 9b7426c..731470f 100644 --- a/pillar.example +++ b/pillar.example @@ -10,3 +10,4 @@ mysql: client: mysql-client service: mysql-service config: /etc/mysql/my.cnf + python: python-mysqldb