From 02081cccce72d1695dda7da69b2f6a97e2f53015 Mon Sep 17 00:00:00 2001
From: Clayton Kramer <clayton.kramer@rrd.com>
Date: Mon, 12 May 2014 11:04:24 -0400
Subject: [PATCH] Added feature for setting up MySQL root password via the Salt
 debconf state instead of through the pkg state.

---
 mysql/files/mysql.deb.set |  3 ---
 mysql/server.sls          | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 mysql/files/mysql.deb.set

diff --git a/mysql/files/mysql.deb.set b/mysql/files/mysql.deb.set
deleted file mode 100644
index 3ccc701..0000000
--- a/mysql/files/mysql.deb.set
+++ /dev/null
@@ -1,3 +0,0 @@
-mysql-server-5.5  mysql-server/root_password_again  password somepass
-mysql-server-5.5  mysql-server/root_password  password somepass
-mysql-server-5.5  mysql-server/start_on_boot  boolean true
diff --git a/mysql/server.sls b/mysql/server.sls
index 9d39ecb..6586404 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -1,11 +1,23 @@
 {% from "mysql/map.jinja" import mysql with context %}
 
+
+{% if grains['os'] in ['Ubuntu', 'Debian'] %}
+mysql-debconf:
+  debconf.set:
+    - name: mysql-server
+    - data:
+        'mysql-server/root_password': {'type': 'password', 'value': '{{ salt['pillar.get']('mysql:server:root_password', 'somepass') }}'}
+        'mysql-server/root_password_again': {'type': 'password', 'value': '{{ salt['pillar.get']('mysql:server:root_password', 'somepass') }}'}
+        'mysql-server/start_on_boot': {'type': 'boolean', 'value': 'true'}
+{% endif %}
+
 mysqld:
   pkg:
     - installed
     - name: {{ mysql.server }}
 {% if grains['os'] in ['Ubuntu', 'Debian'] %}
-    - debconf: salt://mysql/files/mysql.deb.set
+    - require:
+      - debconf: mysql-debconf
 {% endif %}
   service:
     - running