Skip to content

Commit 137d0db

Browse files
committed
Merge pull request #610 from cmurphy/sles12
Fix support for SLES 12
2 parents 510dfda + 25b6534 commit 137d0db

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

manifests/params.pp

+20-15
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@
4545
$provider = 'mysql'
4646
}
4747
}
48-
'SLES': {
49-
if $::operatingsystemmajrelease >= 12 {
50-
$provider = 'mariadb'
51-
} else {
52-
$provider = 'mysql'
53-
}
54-
}
5548
default: {
5649
$provider = 'mysql'
5750
}
@@ -95,15 +88,27 @@
9588
}
9689

9790
'Suse': {
98-
$client_package_name = $::operatingsystem ? {
99-
/OpenSuSE/ => 'mysql-community-server-client',
100-
/(SLES|SLED)/ => 'mysql-client',
101-
}
102-
$server_package_name = $::operatingsystem ? {
103-
/OpenSuSE/ => 'mysql-community-server',
104-
/(SLES|SLED)/ => 'mysql',
91+
case $::operatingsystem {
92+
'OpenSuSE': {
93+
$client_package_name = 'mysql-community-server-client'
94+
$server_package_name = 'mysql-community-server'
95+
$basedir = '/usr'
96+
}
97+
'SLES','SLED': {
98+
if $::operatingsystemmajrelease >= 12 {
99+
$client_package_name = 'mariadb-client'
100+
$server_package_name = 'mariadb'
101+
$basedir = undef
102+
} else {
103+
$client_package_name = 'mysql-client'
104+
$server_package_name = 'mysql'
105+
$basedir = '/usr'
106+
}
107+
}
108+
default: {
109+
fail("Unsupported platform: puppetlabs-${module_name} currently doesn't support ${::operatingsystem}")
110+
}
105111
}
106-
$basedir = '/usr'
107112
$config_file = '/etc/my.cnf'
108113
$includedir = '/etc/my.cnf.d'
109114
$datadir = '/var/lib/mysql'

0 commit comments

Comments
 (0)