Introduce standardized mapping files

saltstack-formulas · Jun 24, 2018 · 1e826ea · 1e826ea
1 parent 2537583
commit 1e826ea
Show file tree

Hide file tree

Showing 19 changed files with 442 additions and 474 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 %}
@@ -20,6 +19,8 @@ mysql_server_config:
     - template: jinja
     - source: salt://{{ tpldir }}/files/server.cnf
     {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
+    - context:
+      tpldir: {{ tpldir }}
     - user: root
     - group: root
     - mode: 644
@@ -33,6 +34,8 @@ mysql_galera_config:
     - template: jinja
     - source: salt://{{ tpldir }}/files/galera.cnf
     {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
+    - context:
+      tpldir: {{ tpldir }}
     - user: root
     - group: root
     - mode: 644
@@ -46,6 +49,8 @@ mysql_library_config:
     - template: jinja
     - source: salt://{{ tpldir }}/files/client.cnf
     {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
+    - context:
+      tpldir: {{ tpldir }}
     - user: root
     - group: root
     - mode: 644
@@ -59,6 +64,8 @@ mysql_clients_config:
     - template: jinja
     - source: salt://{{ tpldir }}/files/mysql-clients.cnf
     {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
+    - context:
+      tpldir: {{ tpldir }}
     - user: root
     - group: root
     - mode: 644
@@ -76,6 +83,8 @@ mysql_config:
 {% else %}
     - source: salt://{{ tpldir }}/files/my.cnf
 {% endif %}
+    - context:
+      tpldir: {{ tpldir }}
     {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %}
     - user: root
     - group: root

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