Don't duplicate mysql information in case galera is used

salt/files/minion.conf

@@ -60,7 +60,17 @@ sentry_handler:
   {%- endif %}
 {%- endif %}
 
-{%- if pillar.get('mysql', {}).server is defined %}
+{%- if pillar.get('galera', {}).master is defined %}
+
+{%- from "galera/map.jinja" import master with context %}
+mysql.unix_socket: {{ master.socket }}
+mysql.user: '{{ pillar.galera.master.admin.user }}'
+mysql.pass: '{{ pillar.galera.master.admin.password }}'
+mysql.db: 'mysql'
+mysql.charset: 'utf8'
+
+{%- elif pillar.get('mysql', {}).server is defined %}
+
 mysql.unix_socket: /var/run/mysqld/mysqld.sock
 {%- if pillar.mysql.server.admin is defined %}
 mysql.user: '{{ pillar.mysql.server.admin.user }}'
@@ -73,13 +83,6 @@ mysql.db: 'mysql'
 mysql.charset: 'utf8'
 {%- endif %}
 
-{%- if pillar.get('galera', {}).master is defined %}
-{%- from "galera/map.jinja" import master with context %}
-mysql.unix_socket: {{ master.socket }}
-mysql.user: '{{ pillar.galera.master.admin.user }}'
-mysql.pass: '{{ pillar.galera.master.admin.password }}'
-mysql.db: 'mysql'
-mysql.charset: 'utf8'
 {%- endif %}
 
 {%- if pillar.get('mongodb', {}).server is defined %}