From c2c1e3959e9c7898c9bb603d5df491e2b96f1b19 Mon Sep 17 00:00:00 2001
From: Wolodja Wentland <w@babilen5.org>
Date: Tue, 25 Nov 2014 17:42:08 +0000
Subject: [PATCH] Ensure that debconf-utils is installed on Debian systems

debconf.set which is used in mysql.server has a dependency on debconf-utils. If
it is not installed the password will not be set and is cumbersome to change
later on.
---
 mysql/defaults.yaml | 2 ++
 mysql/server.sls    | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml
index 02322a1..f5f80e2 100644
--- a/mysql/defaults.yaml
+++ b/mysql/defaults.yaml
@@ -5,6 +5,7 @@ Ubuntu:
   client: mysql-client
   service: mysql
   python: python-mysqldb
+  debconf_utils: debconf-utils
   config:
     file: /etc/mysql/my.cnf
     sections:
@@ -48,6 +49,7 @@ Debian:
   client: mysql-client
   service: mysql
   python: python-mysqldb
+  debconf_utils: debconf-utils
   config:
     file: /etc/mysql/my.cnf
     sections:
diff --git a/mysql/server.sls b/mysql/server.sls
index 4baa582..5b9ac2d 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -7,6 +7,10 @@
 
 {% if mysql_root_password %}
 {% if os_family == 'Debian' %}
+mysql_debconf_utils:
+  pkg.installed:
+    - name: {{ mysql.debconf_utils }}
+
 mysql_debconf:
   debconf.set:
     - name: mysql-server
@@ -16,6 +20,8 @@ mysql_debconf:
         'mysql-server/start_on_boot': {'type': 'boolean', 'value': 'true'}
     - require_in:
       - pkg: mysqld
+    - require:
+      - pkg: mysql_debconf_utils
 {% elif os_family == 'RedHat' %}
 mysql_root_password:
   cmd.run: