From 85fe278b09ad514a90ffe0bb68232fd90b8581ef 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 13:06:06 +0100
Subject: [PATCH] overwrite mysql default directly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this instead of passing specifiy value every time.
Also use “server_package_name” and client_package_name intead of
the now deprecated “package_name” parameter.
---
 manifests/database/sql.pp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp
index a58f5073..d3aadbc7 100644
--- a/manifests/database/sql.pp
+++ b/manifests/database/sql.pp
@@ -54,10 +54,18 @@ class privatecloud::database::sql (
 
   case $::osfamily {
     'RedHat': {
-        $package_name = 'MariaDB-Galera-server'
+        class { 'mysql':
+            server_package_name => 'MariaDB-Galera-server',
+            client_package_name => 'MariaDB-client',
+            service_name         => 'mysql'
+        }
     }
     'Debian': {
-        $package_name = 'mariadb-galera-server'
+        class { 'mysql':
+            server_package_name => 'mariadb-galera-server',
+            client_package_name => 'mariadb-client',
+            service_name         => 'mysql'
+        }
     }
     default: {
       err "${::osfamily} not supported yet"
@@ -65,14 +73,12 @@ class privatecloud::database::sql (
   }
 
   class { 'mysql::server':
-    package_name      => $package_name,
     # with MariaDB package, service_name is mysql for all OS
-    service_name      => 'mysql',
-    config_hash       => {
-      bind_address  => $api_eth,
-      root_password => $mysql_password,
+    config_hash         => {
+      bind_address      => $api_eth,
+      root_password     => $mysql_password,
     },
-    notify            => Service['xinetd'],
+    notify              => Service['xinetd'],
   }
 
   if $::hostname == $galera_master {