Introduce standardized mapping files

saltstack-formulas · Jun 18, 2018 · 841a4fd · 841a4fd
1 parent 2537583
commit 841a4fd
Show file tree

Hide file tree

Showing 19 changed files with 433 additions and 468 deletions.
diff --git a/mysql/client.sls b/mysql/client.sls
@@ -1,9 +1,8 @@
 include:
   - .config
 
-{% from tpldir ~ "/defaults.yaml" import rawmap with context %}
-{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %}
+{% from tpldir ~ "/map.jinja" import mysql with context %}
 
 mysql:
   pkg.installed:
-    - name: {{ mysql.client }}
+    - name: {{ mysql.clientpkg }}
diff --git a/mysql/config.sls b/mysql/config.sls
@@ -1,5 +1,4 @@
-{% from tpldir ~ "/defaults.yaml" import rawmap with context %}
-{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %}
+{% from tpldir ~ "/map.jinja" import mysql with context %}
 {% set os_family = salt['grains.get']('os_family', None) %}
 
 {% if "config_directory" in mysql %}

diff --git a/mysql/database.sls b/mysql/database.sls
@@ -1,5 +1,4 @@
-{% from tpldir ~ "/defaults.yaml" import rawmap with context %}
-{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %}
+{% from tpldir ~ "/map.jinja" import mysql with context %}
 
 {% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}
 {% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}