mysql: Do not start SSL connection when bootstrapping

crowbar · Oct 2, 2017 · bfc9344 · bfc9344
1 parent cd2652e
commit bfc9344
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/chef/cookbooks/mysql/recipes/ha_galera.rb b/chef/cookbooks/mysql/recipes/ha_galera.rb
@@ -71,6 +71,7 @@
     db_connection[:host] = "localhost"
     db_connection[:username] = "root"
     db_connection[:password] = ""
+    db_connection[:ssl] = {}
 
     service "mysql-temp start" do
       service_name mysql_service_name

diff --git a/chef/cookbooks/mysql/recipes/server.rb b/chef/cookbooks/mysql/recipes/server.rb
@@ -164,6 +164,7 @@
 db_connection[:host] = "localhost"
 db_connection[:username] = "root"
 db_connection[:password] = node[:database][:mysql][:server_root_password]
+db_connection[:ssl] = {}
 
 unless node[:database][:database_bootstrapped]
   database_user "create db_maker database user" do
@@ -206,7 +207,7 @@
       "TRIGGER"
     ]
     provider db_settings[:user_provider]
-    require_ssl db_connection[:ssl][:enabled]
+    require_ssl node[:mysql][:ssl][:enabled]
     action :grant
     only_if { !ha_enabled || CrowbarPacemakerHelper.is_cluster_founder?(node) }
   end