From 553831bf3440fb139b9e95616d9dc79728ec2669 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 10 Jan 2015 01:50:39 +0100 Subject: on EL7 there is now mariadb --- manifests/client/base.pp | 10 ++++++++-- manifests/server/centos.pp | 13 +++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/manifests/client/base.pp b/manifests/client/base.pp index b09b90e..8106ded 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -1,7 +1,13 @@ # basic mysql client stuff class mysql::client::base { package { 'mysql': - ensure => present, - alias => 'mysql-client', + ensure => present, + alias => 'mysql-client', + } + if $::operatingsystem in ['RedHat', 'CentOS'] and + $::operatingsystemmajrelease > 6 { + Package[mysql]{ + name => 'mariadb' + } } } diff --git a/manifests/server/centos.pp b/manifests/server/centos.pp index 50678cf..5c0ab34 100644 --- a/manifests/server/centos.pp +++ b/manifests/server/centos.pp @@ -1,7 +1,16 @@ # centos specific things class mysql::server::centos inherits mysql::server::clientpackage { - Service['mysql']{ - name => 'mysqld', + if $::operatingsystemmajrelease > 6 { + Package['mysql-server']{ + name => 'mariadb-server', + } + Service['mysql']{ + name => 'mariadb', + } + } else { + Service['mysql']{ + name => 'mysqld', + } } File['mysql_main_cnf']{ path => '/etc/my.cnf', -- cgit v1.2.3