Password field rename to authentication_string in some implementations

diff --git a/manifests/server.pp b/manifests/server.pp
index 3417119e1c9da6853c91033db810eee9dda37a1f..3bdbf7b1884465059bef030e3dea0354ecad2b11 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -8,6 +8,17 @@ class mysql::server(
 
   include mysql
 
+  $authentication_string = $::lsbdistid ? {
+    'ubuntu' => $::lsbdistcodename ? {
+      'trusty' => 'Password=PASSWORD',
+      'xenial' => $implementation ? {
+        'mysql-server' => 'authentication_string=password',
+        default        => 'Password=PASSWORD',
+      },
+    },
+    default => 'Password=PASSWORD',
+  }
+
   package { "mysql-server":
     name   => $implementation,
     ensure => installed,

diff --git a/templates/setmysqlpass.sh.erb b/templates/setmysqlpass.sh.erb
index 3205e946b11ecb003b63983c9bb282e6b6ce50f3..6e700f657f899adcb691e73f5ea727d8fb6c1ed6 100644 (file)
--- a/templates/setmysqlpass.sh.erb
+++ b/templates/setmysqlpass.sh.erb
@@ -9,9 +9,9 @@ DEFAULTS="/etc/mysql/debian.cnf"
 
 # Run
 /usr/bin/mysql --defaults-file=$DEFAULTS <<EOF
-UPDATE mysql.user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='localhost';
-UPDATE mysql.user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='<%= @fqdn %>';
-UPDATE mysql.user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='127.0.0.1';
-UPDATE mysql.user SET Password=PASSWORD('$PASSWORD') WHERE User='root' AND Host='::1';
+UPDATE mysql.user SET <%= @password_string %>('$PASSWORD') WHERE User='root' AND Host='localhost';
+UPDATE mysql.user SET <%= @password_string %>('$PASSWORD') WHERE User='root' AND Host='<%= @fqdn %>';
+UPDATE mysql.user SET <%= @password_string %>('$PASSWORD') WHERE User='root' AND Host='127.0.0.1';
+UPDATE mysql.user SET <%= @password_string %>('$PASSWORD') WHERE User='root' AND Host='::1';
 FLUSH PRIVILEGES;
 EOF