Skip to content

Commit 5ddc889

Browse files
committed
Add default values for more openSUSE and SLES distro versions
1 parent 7a4f013 commit 5ddc889

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

manifests/globals.pp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,13 @@
9494
'FreeBSD' => '93',
9595
'OpenBSD' => '9.3',
9696
'Suse' => $::operatingsystem ? {
97-
'SLES' => '91',
97+
'SLES' => $::operatingsystemrelease ? {
98+
/11\.[0-4]/ => '91',
99+
default => '93',
100+
},
101+
'OpenSuSE' => $::operatingsystemrelease ? {
102+
'13.2' => '93',
103+
},
98104
default => undef,
99105
},
100106
default => undef,

manifests/params.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@
217217
$server_package_name = pick($server_package_name, "postgresql${version}-server")
218218
$contrib_package_name = pick($contrib_package_name, "postgresql${version}-contrib")
219219
$devel_package_name = pick($devel_package_name, "postgresql${version}-devel")
220-
$java_package_name = pick($java_package_name, undef)
221-
$perl_package_name = pick($plperl_package_name, undef)
222-
$plperl_package_name = pick($plperl_package_name, undef)
223-
$python_package_name = pick($python_package_name, undef)
220+
$java_package_name = pick($java_package_name, "postgresql${version}-jdbc")
221+
$perl_package_name = pick($plperl_package_name, 'perl-DBD-Pg')
222+
$plperl_package_name = pick($plperl_package_name, "postgresql${version}-plperl")
223+
$python_package_name = pick($python_package_name, 'python-psycopg2')
224224

225225
$service_name = pick($service_name, 'postgresql')
226226
$bindir = pick($bindir, "/usr/lib/postgresql${version}/bin")

0 commit comments

Comments
 (0)