From 19356e76d6a68dc1a42dbf07362d957c4b734292 Mon Sep 17 00:00:00 2001 From: Maxime LYKENG Date: Fri, 7 Sep 2018 16:04:55 +0200 Subject: [PATCH] add mysql_native_password for mariadb 10.2 in password_hash --- lib/puppet/provider/mysql_user/mysql.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/mysql_user/mysql.rb b/lib/puppet/provider/mysql_user/mysql.rb index bbe7b63a1..4c6988457 100644 --- a/lib/puppet/provider/mysql_user/mysql.rb +++ b/lib/puppet/provider/mysql_user/mysql.rb @@ -125,7 +125,7 @@ def password_hash=(string) if mysqld_version.nil? # default ... if mysqld_version does not work self.class.mysql_caller("SET PASSWORD FOR #{merged_name} = '#{string}'", 'system') - elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6') + elsif newer_than('mysql' => '5.7.6', 'percona' => '5.7.6', 'mariadb' => '10.2.0') raise ArgumentError, _('Only mysql_native_password (*ABCD...XXX) hashes are supported.') unless string =~ %r{^\*|^$} self.class.mysql_caller("ALTER USER #{merged_name} IDENTIFIED WITH mysql_native_password AS '#{string}'", 'system') else