diff --git a/mysql/database.sls b/mysql/database.sls index 24c3bcd..e9bbba7 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -1,5 +1,8 @@ {% from "mysql/map.jinja" import mysql with context %} +include: + - mysql.python + {% for database in salt['pillar.get']('mysql:database', []) %} {{ database }}: mysql_database.present: diff --git a/mysql/server.sls b/mysql/server.sls index e620ba1..5b28df9 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -50,11 +50,6 @@ mysqld: - watch: - pkg: mysqld -mysql-python: - pkg: - - installed - - name: {{ mysql.python }} - {% if grains['os'] in ['Ubuntu', 'Debian', 'Gentoo', 'CentOS'] %} my.cnf: file.managed: diff --git a/mysql/user.sls b/mysql/user.sls index 2e4f935..4a09c77 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -1,5 +1,8 @@ {% from "mysql/map.jinja" import mysql with context %} +include: + - mysql.python + {% for user in salt['pillar.get']('mysql:user', []) %} {{ user['name'] }}: mysql_user.present: