Merge pull request #511 from mhaskel/rhel7-fixes

Rhel7 fixes

manifests/params.pp

@@ -50,7 +50,7 @@
         $server_package_name = 'mariadb-server'
         $server_service_name = 'mariadb'
         $log_error           = '/var/log/mariadb/mariadb.log'
-        $config_file         = '/etc/my.cnf.d/server.cnf'
+        $config_file         = '/etc/my.cnf'
         $pidfile             = '/var/run/mariadb/mariadb.pid'
       } else {
         $client_package_name = 'mysql'

spec/acceptance/mysql_backup_spec.rb

@@ -13,6 +13,10 @@ class { 'mysql::server': root_password => 'password' }
           password => 'secret',
         }
 
+        package { 'bzip2':
+          ensure => present,
+        }
+
         class { 'mysql::server::backup':
           backupuser     => 'myuser',
           backuppassword => 'mypassword',
@@ -25,6 +29,7 @@ class { 'mysql::server::backup':
             'touch /var/tmp/mysqlbackups.done',
           ],
           execpath      => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin',
+          require       => Package['bzip2'],
         }
       EOS
 

spec/acceptance/mysql_bindings_spec.rb

@@ -2,6 +2,7 @@
 
 osfamily = fact('osfamily')
 operatingsystem = fact('operatingsystem')
+ruby_package_provider = 'undef'
 
 case osfamily
 when 'RedHat'
@@ -10,6 +11,9 @@
   php_package    = 'php-mysql'
   python_package = 'MySQL-python'
   ruby_package   = 'ruby-mysql'
+  if fact('operatingsystemmajrelease') == '7'
+    ruby_package_provider = 'gem'
+  end
 when 'Suse'
   java_package   = 'mysql-connector-java'
   perl_package   = 'perl-DBD-mysql'
@@ -81,7 +85,7 @@ class { 'mysql::bindings':
           perl_package_provider   => undef,
           php_package_provider    => undef,
           python_package_provider => undef,
-          ruby_package_provider   => undef,
+          ruby_package_provider   => #{ruby_package_provider},
         }
       EOS
 
@@ -110,8 +114,15 @@ class { 'mysql::bindings':
       it { should be_installed }
     end
 
-    describe package(ruby_package) do
-      it { should be_installed }
+    # ruby-mysql is installed via gem on RHEL7, be_installed doesn't know how to check that
+    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
+      describe package(ruby_package) do
+        it { should_not be_installed }
+      end
+    else
+      describe package(ruby_package) do
+        it { should be_installed }
+      end
     end
   end
 end

spec/acceptance/mysql_server_root_password_spec.rb

@@ -18,7 +18,7 @@ class { 'mysql::server': service_enabled => false }
     it 'deletes all databases' do
       case fact('osfamily')
       when 'RedHat', 'Suse'
-        shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
+        shell('grep -q datadir /etc/my.cnf && rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
       when 'Debian'
         shell('rm -rf `grep datadir /etc/mysql/my.cnf | cut -d" " -f 3`/*')
         shell('mysql_install_db')

spec/acceptance/mysql_server_spec.rb

@@ -3,10 +3,17 @@
 describe 'mysql class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   case fact('osfamily')
   when 'RedHat'
-    package_name     = 'mysql-server'
-    service_name     = 'mysqld'
-    service_provider = 'undef'
-    mycnf            = '/etc/my.cnf'
+    if fact('operatingsystemmajrelease') == '7'
+      package_name     = 'mariadb-server'
+      service_name     = 'mariadb'
+      service_provider = 'undef'
+      mycnf            = '/etc/my.cnf'
+    else
+      package_name     = 'mysql-server'
+      service_name     = 'mysqld'
+      service_provider = 'undef'
+      mycnf            = '/etc/my.cnf'
+    end
   when 'Suse'
     case fact('operatingsystem')
     when 'OpenSuSE'

spec/spec_helper_acceptance.rb

@@ -33,6 +33,8 @@
           shell("yum localinstall -y http://mirror.pnl.gov/epel/6/i386/epel-release-6-8.noarch.rpm")
         elsif version == '5'
           shell("yum localinstall -y http://mirrors.servercentral.net/fedora/epel/5/i386/epel-release-5-4.noarch.rpm")
+        elsif version == '7'
+          puts "There aren't actually any failures on RHEL7 without EPEL."
         else
           puts "Sorry, this version is not supported."
           exit