From 5d7b01a5e34cb9fbd84fa6ba072f012ba76d5715 Mon Sep 17 00:00:00 2001 From: Phil Lavin Date: Wed, 16 Sep 2015 12:00:32 +0100 Subject: [PATCH 1/3] Use mysql.server variable instead of hardcoded mysql-server for debconf --- mysql/server.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index fbda31b..bb46932 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -15,11 +15,11 @@ mysql_debconf_utils: mysql_debconf: debconf.set: - - name: mysql-server + - name: {{ mysql.server }} - data: - 'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} - 'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} - 'mysql-server/start_on_boot': {'type': 'boolean', 'value': 'true'} + '{{ mysql.server }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} + '{{ mysql.server }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} + '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'} - require_in: - pkg: mysqld - require: From 5da21111e4e1cba72ab61bf89768670ed0247484 Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Fri, 18 Sep 2015 00:26:24 -0600 Subject: [PATCH 2/3] Fix RedHat MySQL admin root password setup. --- mysql/server.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index bb46932..1a28cc6 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -27,8 +27,8 @@ mysql_debconf: {% elif os_family == 'RedHat' or 'Suse' %} mysql_root_password: cmd.run: - - name: mysqladmin --user root password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' - - unless: mysql --user root --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" + - name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' + - unless: mysql --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" - require: - service: mysqld From 8b0c7cc71d66eab472db5921a372997da4762b2d Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Thu, 24 Sep 2015 19:30:03 -0600 Subject: [PATCH 3/3] Fix database administrative user within database import command. --- mysql/database.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/database.sls b/mysql/database.sls index 35caa21..7f3daa6 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -35,7 +35,7 @@ include: {{ state_id }}_load: cmd.wait: - - name: mysql -u root -p{{ mysql_root_pass }} {{ database }} < /etc/mysql/{{ database }}.schema + - name: mysql -u {{ mysql_root_user }} -p{{ mysql_root_pass }} {{ database }} < /etc/mysql/{{ database }}.schema - watch: - file: {{ state_id }}_schema - mysql_database: {{ state_id }}