Skip to content

Commit 00322bd

Browse files
committed
Merge pull request puppetlabs#615 from tampakrap/opensuse_defaults
Add default values for more openSUSE and SLES distro versions
2 parents d5efb1f + 5ddc889 commit 00322bd

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

Diff for: manifests/globals.pp

+7-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,13 @@
9595
'FreeBSD' => '93',
9696
'OpenBSD' => '9.3',
9797
'Suse' => $::operatingsystem ? {
98-
'SLES' => '91',
98+
'SLES' => $::operatingsystemrelease ? {
99+
/11\.[0-4]/ => '91',
100+
default => '93',
101+
},
102+
'OpenSuSE' => $::operatingsystemrelease ? {
103+
'13.2' => '93',
104+
},
99105
default => undef,
100106
},
101107
default => undef,

Diff for: manifests/params.pp

+4-4
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)