Merge branch 'master' of https://github.com/saltstack-formulas/mysql-…

…formula into osfamilymap
saltstack-formulas · Jun 18, 2018 · 3d0c389 · 3d0c389
2 parents 704ee89 + 2537583
commit 3d0c389
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 19 deletions.
diff --git a/mysql/client.sls b/mysql/client.sls
@@ -1,5 +1,5 @@
 include:
-  - mysql.config
+  - .config
 
 {% from tpldir ~ "/map.jinja" import mysql with context %}
 

diff --git a/mysql/config.sls b/mysql/config.sls
@@ -1,4 +1,5 @@
 {% 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
@@ -9,7 +9,7 @@
 {% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
 
 include:
-  - mysql.python
+  - .python
 
 {% for database_obj in salt['pillar.get']('mysql:database', []) %}
 {% set state_id = 'mysql_db_' ~ loop.index0 %}

diff --git a/mysql/init.sls b/mysql/init.sls
@@ -1,5 +1,5 @@
-{% from 'mysql/database.sls' import db_states with context %}
-{% from 'mysql/user.sls' import user_states with context %}
+{% from tpldir ~ '/database.sls' import db_states with context %}
+{% from tpldir ~ '/user.sls' import user_states with context %}
 
 {% macro requisites(type, states) %}
       {%- for state in states %}
@@ -11,14 +11,14 @@
 {% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %}
 
 include:
-  - mysql.server
+  - .server
 {% if mysql_salt_user %}
-  - mysql.salt-user
+  - .salt-user
 {% endif %}
-  - mysql.database
-  - mysql.user
+  - .database
+  - .user
 {% if mysql_dev %}
-  - mysql.dev
+  - .dev
 {% endif %}
 
 

diff --git a/mysql/remove_test_database.sls b/mysql/remove_test_database.sls
@@ -5,7 +5,7 @@
 {% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
 
 include:
-  - mysql.python
+  - .python
 
 mysql remove test database:
   mysql_database.absent:

diff --git a/mysql/repo.sls b/mysql/repo.sls
@@ -1,5 +1,5 @@
 include:
-  - mysql.config
+  - .config
 
 {% from tpldir ~ "/map.jinja" import mysql with context %}
 

diff --git a/mysql/salt-user.sls b/mysql/salt-user.sls
@@ -1,5 +1,5 @@
 include:
-  - mysql.server
+  - .server
 
 {% set os_family = salt['grains.get']('os_family', None) %}
 {% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', 'salt') %}

diff --git a/mysql/server.sls b/mysql/server.sls
@@ -1,6 +1,6 @@
 include:
-  - mysql.config
-  - mysql.python
+  - .config
+  - .python
 
 {% from tpldir ~ "/map.jinja" import mysql with context %}
 

diff --git a/mysql/user.sls b/mysql/user.sls
@@ -10,7 +10,7 @@
 {% set user_hosts = [] %}
 
 include:
-  - mysql.python
+  - .python
 
 {% for name, user in salt['pillar.get']('mysql:user', {}).items() %}
 

diff --git a/pillar.example b/pillar.example
@@ -58,23 +58,23 @@ mysql:
   schema:
     foo:
       load: True
-      source: salt://mysql/files/foo.schema
+      source: salt://{{ tpldir }}/files/foo.schema
     bar:
       load: False
     baz:
       load: True
-      source: salt://mysql/files/baz.schema.tmpl
+      source: salt://{{ tpldir }}/files/baz.schema.tmpl
       template: jinja
     qux:
       load: True
-      source: salt://mysql/files/qux.schema.tmpl
+      source: salt://{{ tpldir }}/files/qux.schema.tmpl
       template: jinja
       context:
         encabulator: Turbo
         girdlespring: differential
     quux:
       load: True
-      source: salt://mysql/files/qux.schema.tmpl
+      source: salt://{{ tpldir }}/files/qux.schema.tmpl
       template: jinja
       context:
         encabulator: Retro