From adacdb49e4e605ee4c5976efdd86c8d384942ded Mon Sep 17 00:00:00 2001
From: Chad Heuschober <chad.heuschober@cuny.edu>
Date: Wed, 21 May 2014 12:06:17 -0400
Subject: [PATCH] Fixed state names without proper namespacing that could lead
 to potential conflicts.

---
 mysql/database.sls | 2 +-
 mysql/user.sls     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mysql/database.sls b/mysql/database.sls
index e9bbba7..eed6a24 100644
--- a/mysql/database.sls
+++ b/mysql/database.sls
@@ -4,7 +4,7 @@ include:
   - mysql.python
 
 {% for database in salt['pillar.get']('mysql:database', []) %}
-{{ database }}:
+mysql_db_{{ database }}:
   mysql_database.present:
     - host: localhost
     - connection_user: root
diff --git a/mysql/user.sls b/mysql/user.sls
index 4a09c77..54f6f7d 100644
--- a/mysql/user.sls
+++ b/mysql/user.sls
@@ -4,8 +4,9 @@ include:
   - mysql.python
 
 {% for user in salt['pillar.get']('mysql:user', []) %}
-{{ user['name'] }}:
+mysql_user_{{ user['name'] }}:
   mysql_user.present:
+    - name: {{ user['name'] }}
     - host: {{ user['host'] }}
   {%- if user['password_hash'] is defined %}
     - password_hash: '{{ user['password_hash'] }}'
@@ -18,8 +19,10 @@ include:
     - connection_charset: utf8
 
 {% for db in user['databases'] %}
-{{ user['name'] }}_{{ db['database'] }}:
+{% set name = user['name'] ~ '_' ~ db['database'] %}
+mysql_user_{{ name }}:
   mysql_grants.present:
+    - name: {{ name }}
     - grant: {{db['grants']|join(",")}}
     - database: {{ db['database'] }}.*
     - user: {{ user['name'] }}