From 01087cdaceef6828655eabf84146d2e328630b51 Mon Sep 17 00:00:00 2001
From: David Gurtner <aldavud@crimson.ch>
Date: Fri, 20 Feb 2015 10:03:37 +0100
Subject: [PATCH] Fix wsrep_provider_options if SSL false

Currently when wsrep_ssl is set to false but wsrep_ssl_cert and
wsrep_ssl_key are set and invalid configuration results.

gcomm+ssl will correctly disable SSL, but IST still tries to run
via SSL and will consequently fail.
---
 galera/manifests/server.pp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/galera/manifests/server.pp b/galera/manifests/server.pp
index e99744c..5496ea2 100644
--- a/galera/manifests/server.pp
+++ b/galera/manifests/server.pp
@@ -121,11 +121,17 @@ class galera::server (
     warning("DEPRECATED: wsrep_bind_address is deprecated, you should use bind_address of mysql module")
   }
 
-  $wsrep_provider_options = wsrep_options({
-    'socket.ssl'      => $wsrep_ssl,
-    'socket.ssl_key'  => $wsrep_ssl_key,
-    'socket.ssl_cert' => $wsrep_ssl_cert,
-  })
+  if $wsrep_ssl {
+    $wsrep_provider_options = wsrep_options({
+      'socket.ssl'      => $wsrep_ssl,
+      'socket.ssl_key'  => $wsrep_ssl_key,
+      'socket.ssl_cert' => $wsrep_ssl_cert,
+    })
+  } else {
+    $wsrep_provider_options = wsrep_options({
+      'socket.ssl'      => $wsrep_ssl,
+    })
+  }
 
   $wsrep_debug = bool2num($debug)