commit 8bd8bab7accbce175b12a73f3cf657a7936701fe
author Andres Montalban <amontalban@devopx.com> Thu Sep 22 16:44:16 2016 -0300
committer Andres Montalban <amontalban@devopx.com> Fri Sep 23 09:01:56 2016 -0300
tree 9c3712f85c1ac83b049ce7d0a03b2e09a00d8021
parent 182ea8b8e1281726fba3c8f99b17ede7c73acb9e

Use connection args when using mysql_database.present / mysql_user.present / mysql_grants.present

mysql/map.jinja

diff --git a/mysql/map.jinja b/mysql/map.jinja
index 1ca5f9e..b667b95 100644
--- a/mysql/map.jinja
+++ b/mysql/map.jinja
@@ -26,3 +26,13 @@
         }
     },
 }, merge=salt['pillar.get']('mysql:server')) %}
+
+{%- if server.admin is defined %}
+{%- set mysql_connection_args = {'user': server.admin.user,
+                                 'password': server.admin.password,
+                                 'charset': 'utf8'} %}
+{%- else %}
+{%- set mysql_connection_args = {'user': 'root',
+                                 'password': '',
+                                 'charset': 'utf8'} %}
+{%- endif %}
\ No newline at end of file

mysql/server/database.sls

diff --git a/mysql/server/database.sls b/mysql/server/database.sls
index b662f81..26b8c5e 100644
--- a/mysql/server/database.sls
+++ b/mysql/server/database.sls
@@ -1,4 +1,4 @@
-{%- from "mysql/map.jinja" import server with context %}
+{%- from "mysql/map.jinja" import server, mysql_connection_args with context %}
 
 {%- if not grains.get('noservices', False) %}
 {%- for database_name, database in server.get('database', {}).iteritems() %}
@@ -6,6 +6,9 @@
 mysql_database_{{ database_name }}:
   mysql_database.present:
   - name: {{ database_name }}
+  - connection_user: {{ mysql_connection_args.user }}
+  - connection_pass: {{ mysql_connection_args.password }}
+  - connection_charset: {{ mysql_connection_args.charset }}
 
 {%- for user in database.users %}
 
@@ -18,6 +21,9 @@
   {%- else %}
   - allow_passwordless: true
   {%- endif %}
+  - connection_user: {{ mysql_connection_args.user }}
+  - connection_pass: {{ mysql_connection_args.password }}
+  - connection_charset: {{ mysql_connection_args.charset }}
 
 mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
   mysql_grants.present:
@@ -25,6 +31,9 @@
   - database: '{{ database_name }}.*'
   - user: '{{ user.name }}'
   - host: '{{ user.host }}'
+  - connection_user: {{ mysql_connection_args.user }}
+  - connection_pass: {{ mysql_connection_args.password }}
+  - connection_charset: {{ mysql_connection_args.charset }}
   - require:
     - mysql_user: mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}
     - mysql_database: mysql_database_{{ database_name }}

mysql/server/service.sls

diff --git a/mysql/server/service.sls b/mysql/server/service.sls
index 4d724e2..42c494e 100644
--- a/mysql/server/service.sls
+++ b/mysql/server/service.sls
@@ -1,4 +1,4 @@
-{%- from "mysql/map.jinja" import server with context %}
+{%- from "mysql/map.jinja" import server, mysql_connection_args with context %}
 
 mysql_salt_config:
   file.managed:
@@ -87,6 +87,9 @@
   mysql_user.present:
   - host: '%'
   - password: {{ server.replication.password }}
+  - connection_user: {{ mysql_connection_args.user }}
+  - connection_pass: {{ mysql_connection_args.password }}
+  - connection_charset: {{ mysql_connection_args.charset }}
   - watch_in:
     - service: mysql_service
 
@@ -96,6 +99,9 @@
   - database: '*.*'
   - user: {{ server.replication.user }}
   - host: '%'
+  - connection_user: {{ mysql_connection_args.user }}
+  - connection_pass: {{ mysql_connection_args.password }}
+  - connection_charset: {{ mysql_connection_args.charset }}
   - watch_in:
     - service: mysql_service