[COOK-3674] Fix an issue where the root password is not set properly …

…with a non-default `data_dir`

Signed-off-by: Seth Vargo <sethvargo@gmail.com>

.kitchen.yml

@@ -46,3 +46,10 @@ suites:
   - recipe[minitest-handler]
   - recipe[mysql_test::server]
   attributes: {}
+- name: server-nondefault-data
+  run_list:
+  - recipe[minitest-handler]
+  - recipe[mysql_test::server]
+  attributes:
+    mysql:
+      data_dir: "/data/mysql"

recipes/server.rb

@@ -178,6 +178,14 @@ def package(*args, &blk)
     action :run
     creates "#{node['mysql']['data_dir']}/mysql"
   end
+
+  # set the root password for situations that don't support pre-seeding.
+  # (eg. platforms other than debian/ubuntu & drop-in mysql replacements)
+  execute "assign-root-password mac_os_x" do
+    command %Q["#{node['mysql']['mysqladmin_bin']}" -u root password '#{node['mysql']['server_root_password']}']
+    action :run
+    only_if %Q["#{node['mysql']['mysql_bin']}" -u root -e 'show databases;']
+  end
 else
   execute 'mysql-install-db' do
     command "mysql_install_db"
@@ -195,15 +203,33 @@ def package(*args, &blk)
   end
 end
 
-# set the root password for situations that don't support pre-seeding.
-# (eg. platforms other than debian/ubuntu & drop-in mysql replacements)
-execute "assign-root-password" do
-  command %Q["#{node['mysql']['mysqladmin_bin']}" -u root password '#{node['mysql']['server_root_password']}']
-  action :run
-  only_if %Q["#{node['mysql']['mysql_bin']}" -u root -e 'show databases;']
-end
 
 unless platform_family?(%w{mac_os_x})
+
+  template "#{node['mysql']['conf_dir']}/my.cnf" do
+    source "my.cnf.erb"
+    owner "root" unless platform? 'windows'
+    group node['mysql']['root_group'] unless platform? 'windows'
+    mode "0644"
+    case node['mysql']['reload_action']
+    when 'restart'
+      notifies :restart, "service[mysql]", :immediately
+    when 'reload'
+      notifies :reload, "service[mysql]", :immediately
+    else
+      Chef::Log.info "my.cnf updated but mysql.reload_action is #{node['mysql']['reload_action']}. No action taken."
+    end
+    variables :skip_federated => skip_federated
+  end
+
+  # set the root password for situations that don't support pre-seeding.
+  # (eg. platforms other than debian/ubuntu & drop-in mysql replacements)
+  execute "assign-root-password" do
+    command %Q["#{node['mysql']['mysqladmin_bin']}" -u root password '#{node['mysql']['server_root_password']}']
+    action :run
+    only_if %Q["#{node['mysql']['mysql_bin']}" -u root -e 'show databases;']
+  end
+
   grants_path = node['mysql']['grants_path']
 
   begin