From ff1011e55a2f477b4dd3342520e346d7e00d7183 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dimitri.savineau@enovance.com>
Date: Tue, 30 Sep 2014 10:42:52 -0400
Subject: [PATCH] cloud::database::sql wrong mariadb packages name

Change mariadb packages name on Redhat.
Fix puppet Package requirement on Redhat and Debian.

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
---
 manifests/database/sql.pp               | 12 ++++++------
 spec/classes/cloud_database_sql_spec.rb |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp
index 940ac37d..e6596c34 100644
--- a/manifests/database/sql.pp
+++ b/manifests/database/sql.pp
@@ -166,8 +166,8 @@ class cloud::database::sql (
   case $::osfamily {
     'RedHat': {
       # Specific to Red Hat
-      $mysql_server_package_name = 'MariaDB-Galera-server'
-      $mysql_client_package_name = 'MariaDB-client'
+      $mysql_server_package_name = 'mariadb-galera-server'
+      $mysql_client_package_name = 'mariadb'
       $wsrep_provider = '/usr/lib64/galera/libgalera_smm.so'
       $mysql_server_config_file = '/etc/my.cnf'
 
@@ -194,7 +194,7 @@ class cloud::database::sql (
         command => '/usr/bin/mysql_install_db --rpm --user=mysql',
         unless  => 'test -d /var/lib/mysql/mysql',
         before  => Service['mysqld'],
-        require => [Package['mysql-server'], File[$mysql_server_config_file]]
+        require => [Package[$mysql_server_package_name], File[$mysql_server_config_file]]
       }
 
     } # RedHat
@@ -245,7 +245,7 @@ class cloud::database::sql (
     mode    => '0755',
     group   => 'root',
     notify  => Service['mysqld'],
-    before  => Package['mysql-server'],
+    before  => Package[$mysql_server_package_name],
   }
 
   if($::osfamily == 'Debian'){
@@ -257,7 +257,7 @@ class cloud::database::sql (
       line    => 'MYSQLD_STARTUP_TIMEOUT=120',
       path    => '/etc/init.d/mysql',
       after   => '^CONF=',
-      require => Package['mysql-server'],
+      require => Package[$mysql_server_package_name],
       notify  => Service['mysqld'],
     }
   }
@@ -282,7 +282,7 @@ class cloud::database::sql (
     owner   => 'root',
     group   => 'root',
     notify  => [Service['mysqld'],Exec['clean-mysql-binlog']],
-    require => Package['mysql-server'],
+    require => Package[$mysql_server_package_name],
   }
 
   class { 'mysql::client':
diff --git a/spec/classes/cloud_database_sql_spec.rb b/spec/classes/cloud_database_sql_spec.rb
index fc81fbaa..969492c7 100644
--- a/spec/classes/cloud_database_sql_spec.rb
+++ b/spec/classes/cloud_database_sql_spec.rb
@@ -231,8 +231,8 @@ describe 'cloud::database::sql' do
     end
 
     let :platform_params do
-      { :mysql_server_package_name => 'MariaDB-Galera-server',
-        :mysql_client_package_name => 'MariaDB-client',
+      { :mysql_server_package_name => 'mariadb-galera-server',
+        :mysql_client_package_name => 'mariadb',
         :mysql_server_config_file => '/etc/my.cnf',
         :wsrep_provider      => '/usr/lib64/galera/libgalera_smm.so' }
     end