1 From 01c2f67ba1a938c18f609a9ff3dabe30a547af6d Mon Sep 17 00:00:00 2001
2 From: "Sar Ashki, Babak" <Babak.SarAshki@windriver.com>
3 Date: Thu, 26 Dec 2019 11:32:12 -0800
4 Subject: [PATCH] puppetlabs postgresql: account for naming diffs
6 Centos and other distros package postgresql server into postgresql-server,
7 whereas OE provides postgresql package. This causes problems during bootstrap
8 and consequent failure.
10 Here we are adding this patch as a bbappend to be removed once puppet support
13 manifests/params.pp | 8 ++++----
14 manifests/server/install.pp | 2 +-
15 spec/unit/classes/server_spec.rb | 2 +-
16 3 files changed, 6 insertions(+), 6 deletions(-)
18 diff --git a/manifests/params.pp b/manifests/params.pp
19 index 45be360..3254d63 100644
20 --- a/manifests/params.pp
21 +++ b/manifests/params.pp
22 @@ -34,12 +34,12 @@ class postgresql::params inherits postgresql::globals {
23 $package_version = "${version_parts[0]}${version_parts[1]}"
25 if $version == $postgresql::globals::default_version and $::operatingsystem != 'Amazon' {
26 - $client_package_name = pick($client_package_name, 'postgresql')
27 - $server_package_name = pick($server_package_name, 'postgresql-server')
28 + $client_package_name = pick($client_package_name, 'postgresql-client')
29 + $server_package_name = pick($server_package_name, 'postgresql')
30 $contrib_package_name = pick($contrib_package_name,'postgresql-contrib')
31 - $devel_package_name = pick($devel_package_name, 'postgresql-devel')
32 + $devel_package_name = pick($devel_package_name, 'postgresql-dev')
33 $java_package_name = pick($java_package_name, 'postgresql-jdbc')
34 - $docs_package_name = pick($docs_package_name, 'postgresql-docs')
35 + $docs_package_name = pick($docs_package_name, 'postgresql-doc')
36 $plperl_package_name = pick($plperl_package_name, 'postgresql-plperl')
37 $plpython_package_name = pick($plpython_package_name, 'postgresql-plpython')
38 $service_name = pick($service_name, 'postgresql')
39 diff --git a/manifests/server/install.pp b/manifests/server/install.pp
40 index 8724f9f..ebee6af 100644
41 --- a/manifests/server/install.pp
42 +++ b/manifests/server/install.pp
43 @@ -11,7 +11,7 @@ class postgresql::server::install {
44 default => $package_ensure,
47 - package { 'postgresql-server':
48 + package { 'postgresql':
49 ensure => $_package_ensure,
50 name => $package_name,
52 diff --git a/spec/unit/classes/server_spec.rb b/spec/unit/classes/server_spec.rb
53 index 852b7e4..24e64f5 100644
54 --- a/spec/unit/classes/server_spec.rb
55 +++ b/spec/unit/classes/server_spec.rb
56 @@ -119,7 +119,7 @@ describe 'postgresql::server', :type => :class do
59 it 'should remove the package' do
60 - is_expected.to contain_package('postgresql-server').with({
61 + is_expected.to contain_package('postgresql').with({