From 9034211eb31ab8aea914b640feec7c5cfc819ea5 Mon Sep 17 00:00:00 2001 From: David Gurtner 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. --- manifests/server.pp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index 57a1718..202d4d7 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -73,11 +73,17 @@ ensure => $package_ensure, } - $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)