summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2015-01-10 01:50:39 +0100
committermh <mh@immerda.ch>2015-01-10 01:50:39 +0100
commit553831bf3440fb139b9e95616d9dc79728ec2669 (patch)
tree25aad96bc714d328a1b1e740fe477b37c390728e
parentc06abd681ce71893466b29390e1199c293cdd37e (diff)
on EL7 there is now mariadb
-rw-r--r--manifests/client/base.pp10
-rw-r--r--manifests/server/centos.pp13
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',