Skip to content

Commit c47d1fb

Browse files
committed
Modified params.pp to work on latest Red Hat releases
On Fedora-20+ and RHEL-7+ mysqld service does not work any more and has been replaced by mariadb service. This patch changes all parameters accordingly.
1 parent 97c4d4e commit c47d1fb

File tree

2 files changed

+34
-5
lines changed

2 files changed

+34
-5
lines changed

manifests/params.pp

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,45 @@
2525

2626
case $::osfamily {
2727
'RedHat': {
28-
if $::operatingsystem == 'Fedora' and (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 19 or $::operatingsystemrelease == "Rawhide") {
28+
case $::operatingsystem {
29+
'Fedora': {
30+
if is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 19 or $::operatingsystemrelease == "Rawhide" {
31+
$provider = 'mariadb'
32+
} else {
33+
$provider = 'mysql'
34+
}
35+
}
36+
'RedHat': {
37+
if $::operatingsystemrelease >= 7 {
38+
$provider = 'mariadb'
39+
} else {
40+
$provider = 'mysql'
41+
}
42+
}
43+
default: {
44+
$provider = 'mysql'
45+
}
46+
}
47+
48+
if $provider == 'mariadb' {
2949
$client_package_name = 'mariadb'
3050
$server_package_name = 'mariadb-server'
51+
$server_service_name = 'mariadb'
52+
$log_error = '/var/log/mariadb/mariadb.log'
53+
$config_file = '/etc/my.cnf.d/server.cnf'
54+
$pidfile = '/var/run/mariadb/mariadb.pid'
3155
} else {
3256
$client_package_name = 'mysql'
3357
$server_package_name = 'mysql-server'
58+
$server_service_name = 'mysqld'
59+
$log_error = '/var/log/mysqld.log'
60+
$config_file = '/etc/my.cnf'
61+
$pidfile = '/var/run/mysqld/mysqld.pid'
3462
}
63+
3564
$basedir = '/usr'
36-
$config_file = '/etc/my.cnf'
3765
$datadir = '/var/lib/mysql'
38-
$log_error = '/var/log/mysqld.log'
39-
$pidfile = '/var/run/mysqld/mysqld.pid'
4066
$root_group = 'root'
41-
$server_service_name = 'mysqld'
4267
$socket = '/var/lib/mysql/mysql.sock'
4368
$ssl_ca = '/etc/mysql/cacert.pem'
4469
$ssl_cert = '/etc/mysql/server-cert.pem'

manifests/server/service.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
}
99

1010
if $mysql::server::real_service_manage {
11+
file { $mysql::params::log_error:
12+
owner => 'mysql',
13+
group => 'mysql',
14+
}
1115
service { 'mysqld':
1216
ensure => $service_ensure,
1317
name => $mysql::server::service_name,

0 commit comments

Comments
 (0)