Skip to content

Commit f06cc12

Browse files
committed
Merge pull request #572 from sharumpe/ticket/MODULES-1337-MariaDB_for_OpenSuSE_13.1
Using mariadb in OpenSuSE >= 13.1.
2 parents 7daa297 + 3a6a6c6 commit f06cc12

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

manifests/params.pp

+11-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,17 @@
9696
'Suse': {
9797
case $::operatingsystem {
9898
'OpenSuSE': {
99-
$client_package_name = 'mysql-community-server-client'
100-
$server_package_name = 'mysql-community-server'
101-
$basedir = '/usr'
99+
if versioncmp( $::operatingsystemmajrelease, '13' ) >= 0 {
100+
$client_package_name = 'mariadb-client'
101+
$server_package_name = 'mariadb'
102+
# First service start fails if this is set. Runs fine without
103+
# it being set, in any case. Leaving it as-is for the mysql.
104+
$basedir = undef
105+
} else {
106+
$client_package_name = 'mysql-community-server-client'
107+
$server_package_name = 'mysql-community-server'
108+
$basedir = '/usr'
109+
}
102110
}
103111
'SLES','SLED': {
104112
if versioncmp($::operatingsystemrelease, '12') >= 0 {

0 commit comments

Comments
 (0)