opuppet/module-postgresql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

(MODULES-2968) Add default postgis version for 9.5

Browse source 
This commit also updates the logic that determines the postgis version
so that if version association is missing in the future, it will still
compile.
This commit is contained in:
Hunter Haugen 2016-01-27 15:08:47 -08:00
parent 3e8ca93334
commit a6ccfb217e
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
manifests/globals.pp
View file

@ -132,8 +132,9 @@ class postgresql::globals (
'91' => '1.5', '91' => '1.5',
'9.2' => '2.0', '9.2' => '2.0',
'9.3' => '2.1', '9.3' => '2.1',
'9.4' => '2.1',
'93' => '2.1', '93' => '2.1',
'9.4' => '2.1',
'9.5' => '2.2',
default => undef, default => undef,
} }
$globals_postgis_version = $postgis_version ? { $globals_postgis_version = $postgis_version ? {

20
manifests/params.pp
View file

@ -76,15 +76,15 @@ class postgresql::params inherits postgresql::globals {
$perl_package_name = pick($perl_package_name, 'perl-DBD-Pg') $perl_package_name = pick($perl_package_name, 'perl-DBD-Pg')
$python_package_name = pick($python_package_name, 'python-psycopg2') $python_package_name = pick($python_package_name, 'python-psycopg2')
$postgis_package_name = pick( if $postgresql::globals::postgis_package_name {
$postgis_package_name, $postgis_package_name = $postgresql::globals::postgis_package_name
$::operatingsystemrelease ? { } elsif $::operatingsystemrelease =~ /^5\./ {
/^5\./ => 'postgis', $postgis_package_name = 'postgis'
default => versioncmp($postgis_version, '2') ? { } elsif $postgis_version and versioncmp($postgis_version, '2') < 0 {
'-1' => "postgis${package_version}", $postgis_package_name = "postgis${package_version}"
default => "postgis2_${package_version}",} } else {
} $postgis_package_name = "postgis2_${package_version}"
) }
} }
'Archlinux': { 'Archlinux': {
@ -141,7 +141,7 @@ class postgresql::params inherits postgresql::globals {
$client_package_name = pick($client_package_name, "postgresql-client-${version}") $client_package_name = pick($client_package_name, "postgresql-client-${version}")
$server_package_name = pick($server_package_name, "postgresql-${version}") $server_package_name = pick($server_package_name, "postgresql-${version}")
$contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}") $contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
if versioncmp($postgis_version, '2') < 0 { if $postgis_version and versioncmp($postgis_version, '2') < 0 {
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis") $postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis")
} else { } else {
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis-${postgis_version}") $postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis-${postgis_version}")

16
spec/unit/classes/server_spec.rb
View file

@ -5,6 +5,7 @@ describe 'postgresql::server', :type => :class do
{ {
:osfamily => 'Debian', :osfamily => 'Debian',
:operatingsystem => 'Debian', :operatingsystem => 'Debian',
:lsbdistid => 'Debian',
:operatingsystemrelease => '6.0', :operatingsystemrelease => '6.0',
:concat_basedir => tmpfilename('server'), :concat_basedir => tmpfilename('server'),
:kernel => 'Linux', :kernel => 'Linux',
@ -139,4 +140,19 @@ describe 'postgresql::server', :type => :class do
is_expected.to contain_exec('postgresql_initdb') is_expected.to contain_exec('postgresql_initdb')
end end
end end
describe 'postgresql_version' do
let(:pre_condition) do
<<-EOS
class { 'postgresql::globals':
manage_package_repo => true,
version => '99.5',
before => Class['postgresql::server'],
}
EOS
end
it 'contains the correct package version' do
is_expected.to contain_class('postgresql::repo').with_version('99.5')
end
end
end end