From c5bbc006205cb8c819ea80fcd0030256adbe39bc Mon Sep 17 00:00:00 2001
From: Clayton Kramer <clayton.kramer@rrd.com>
Date: Mon, 12 May 2014 12:35:06 -0400
Subject: [PATCH] Added new database and user SLS files that were left out of
 previous commits.

---
 mysql/database.sls | 12 ++++++++++++
 mysql/user.sls     | 30 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 mysql/database.sls
 create mode 100644 mysql/user.sls

diff --git a/mysql/database.sls b/mysql/database.sls
new file mode 100644
index 0000000..f81741d
--- /dev/null
+++ b/mysql/database.sls
@@ -0,0 +1,12 @@
+{% from "mysql/map.jinja" import mysql with context %}
+
+{% for database in salt['pillar.get']('mysql:database', []) %}
+{{ database }}:
+  mysql_database.present:
+    - host: localhost
+    - connection_user: root
+    - connection_pass: {{ salt['pillar.get']('mysql:server:root_password', 'somepass') }}
+    - connection_charset: utf8
+{% endfor %}
+
+
diff --git a/mysql/user.sls b/mysql/user.sls
new file mode 100644
index 0000000..4f0186e
--- /dev/null
+++ b/mysql/user.sls
@@ -0,0 +1,30 @@
+{% from "mysql/map.jinja" import mysql with context %}
+
+{% for user in salt['pillar.get']('mysql:user', []) %}
+{{ user['name'] }}:
+  mysql_user.present:
+    - host: {{ user['host'] }}
+    - password: {{ user['password'] }}
+    - connection_host: localhost
+    - connection_user: root
+    - connection_pass: {{ salt['pillar.get']('mysql:server:root_password', 'somepass') }}
+    - connection_charset: utf8
+
+{% for db in user['databases'] %}
+{{ user['name'] }}_{{ db['database'] }}:
+  mysql_grants.present:
+    - grant: {{db['grants']|join(",")}}
+    - database: {{ db['database'] }}.*
+    - user: {{ user['name'] }}
+    - host: {{ user['host'] }}
+    - connection_host: localhost
+    - connection_user: root
+    - connection_pass: {{ salt['pillar.get']('mysql:server:root_password', 'somepass') }}
+    - connection_charset: utf8
+    - require:
+      - mysql_user: {{ user['name'] }}
+{% endfor %}
+
+{% endfor %}
+
+