diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 16:46:45 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 16:46:45 -0500 |
| commit | a713d36aeb35595792c09222e4424abfa07ddad8 (patch) | |
| tree | 0ccda588dd9d74dc36529347b19d4ee99a5e72b7 /manifests/client/base.pp | |
| parent | 9b327191c775b8d73bfc1f8e5da062703cf7f377 (diff) | |
| parent | 0ce33a632f30f8845359e2fc146789013dcd4984 (diff) | |
Merge branch 'master' of git://git.puppet.immerda.ch/module-mysql
Conflicts:
files/scripts/optimize_tables.rb
manifests/server/base.pp
Diffstat (limited to 'manifests/client/base.pp')
| -rw-r--r-- | manifests/client/base.pp | 10 |
1 files changed, 8 insertions, 2 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' + } } } |