From be45b25a176f308e59bf470677c1b291d08fb28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri.lebouder@enovance.com>
Date: Sun, 5 Jan 2014 14:59:43 +0100
Subject: [PATCH] fixes for mariadb-galera-server on RHEL

---
 manifests/database/sql.pp         | 16 +++++++++++++++-
 templates/database/mysql.conf.erb |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp
index fc2b0b1b..6508ab5f 100644
--- a/manifests/database/sql.pp
+++ b/manifests/database/sql.pp
@@ -52,6 +52,7 @@ class privatecloud::database::sql (
 
   include 'xinetd'
 
+  # TODO(Gonéri): OS/values detection should be moved in a params.pp
   case $::osfamily {
     'RedHat': {
         class { 'mysql':
@@ -59,6 +60,17 @@ class privatecloud::database::sql (
             client_package_name => 'MariaDB-client',
             service_name         => 'mysql'
         }
+        # galera-23.2.7-1.rhel6.x86_64
+        $wsrep_provider = "/usr/lib64/galera/libgalera_smm.so"
+
+        # TODO(Gonéri)
+        # MariaDB-Galera-server-5.5.34-1.x86_64 doesn't create this
+        # directory
+        file { '/var/log/mysql':
+            ensure => directory
+            mode   => 0750
+        }
+
     }
     'Debian': {
         class { 'mysql':
@@ -66,6 +78,7 @@ class privatecloud::database::sql (
             client_package_name => 'mariadb-client',
             service_name         => 'mysql'
         }
+        $wsrep_provider = "/usr/lib/galera/libgalera_smm.so"
     }
     default: {
       err "${::osfamily} not supported yet"
@@ -189,10 +202,11 @@ basedir  = /usr
   }
 
 
+  # TODO/WARNING(Gonéri): template changes do not trigger configuration changes
   mysql::server::config{'basic_config':
     notify_service => false,
     notify         => Exec['clean-mysql-binlog'],
-    settings       => template('privatecloud/database/mysql.conf.erb'),
+    settings       => template('privatecloud/database/mysql.conf.erb')
   }
 
   exec{'clean-mysql-binlog':
diff --git a/templates/database/mysql.conf.erb b/templates/database/mysql.conf.erb
index a07e0e14..5b995af5 100644
--- a/templates/database/mysql.conf.erb
+++ b/templates/database/mysql.conf.erb
@@ -40,7 +40,7 @@ innodb_max_dirty_pages_pct      = 50
 binlog_format                   = ROW
 innodb_autoinc_lock_mode        = 2
 innodb_locks_unsafe_for_binlog  = 1
-wsrep_provider                  = /usr/lib/galera/libgalera_smm.so
+wsrep_provider                  = "<%= @wsrep_provider %>"
 wsrep_cluster_name              = "galera_cluster"
 <% if @hostname != @galera_master -%>
 # This node is not Galera Master (connect wsrep to galera_master)