commit 51fc143fb0301335c53b377a85d26283f18964c6
author Martin Polreich <mpolreich@mirantis.com> Wed May 10 09:48:59 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Wed May 10 09:48:59 2017 +0000
tree da403af68ab388be6223a35b9e4e70d07efd2173
parent 95d62e27bb5aca43558c2e1b5757f6ba739dc054
parent 773b3534f5625fc54b7458d81ca334f5efd9d8cf

Merge "Manage minion.d using support metadata"

mysql/files/salt-minion.conf

diff --git a/mysql/files/salt-minion.conf b/mysql/files/salt-minion.conf
deleted file mode 100644
index 6b7d028..0000000
--- a/mysql/files/salt-minion.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- from "mysql/map.jinja" import server with context -%}
-mysql.unix_socket: /var/run/mysqld/mysqld.sock
-{%- if server.admin is defined %}
-mysql.user: '{{ server.admin.user }}'
-mysql.pass: '{{ server.admin.password }}'
-{%- else %}
-mysql.user: 'root'
-mysql.pass: ''
-{%- endif %}
-mysql.db: 'mysql'
-mysql.charset: 'utf8'

mysql/meta/salt.yml

diff --git a/mysql/meta/salt.yml b/mysql/meta/salt.yml
new file mode 100644
index 0000000..a2a4675
--- /dev/null
+++ b/mysql/meta/salt.yml
@@ -0,0 +1,19 @@
+minion:
+  {%- if pillar.mysql.server is defined %}
+  mysql:
+    {%- from "mysql/map.jinja" import server with context -%}
+    mysql.unix_socket: /var/run/mysqld/mysqld.sock
+    {%- if server.admin is defined %}
+    mysql.user: '{{ server.admin.user }}'
+    mysql.pass: '{{ server.admin.password }}'
+    {%- else %}
+    mysql.user: 'root'
+    mysql.pass: ''
+    {%- endif %}
+    mysql.db: 'mysql'
+    mysql.charset: 'utf8'
+  {%- endif %}
+
+{#-
+  vim: syntax=jinja
+-#}

mysql/server/service.sls

diff --git a/mysql/server/service.sls b/mysql/server/service.sls
index 42c494e..aaf5912 100644
--- a/mysql/server/service.sls
+++ b/mysql/server/service.sls
@@ -1,12 +1,5 @@
 {%- from "mysql/map.jinja" import server, mysql_connection_args with context %}
 
-mysql_salt_config:
-  file.managed:
-    - name: /etc/salt/minion.d/mysql.conf
-    - template: jinja
-    - source: salt://mysql/files/salt-minion.conf
-    - mode: 600
-
 {%- if server.enabled %}
 
 include: