From: Jackie Huang Date: Tue, 8 Jun 2021 02:32:10 +0000 (+0800) Subject: puppetlabs-postgresql: update for stx 5.0 X-Git-Tag: f-release~96 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=419111278258983eb01a3fc3c35ed9f360f1eb1c;p=pti%2Frtp.git puppetlabs-postgresql: update for stx 5.0 * inherit stx-metadata to help apply patches from stx 'integ' repo * remove the local copy of stx patches Issue-ID: INF-215 Signed-off-by: Jackie Huang Change-Id: Ie1e50c008aaf0f2deab050c8b818d61c537488a7 --- diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0001-Roll-up-TIS-patches.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0001-Roll-up-TIS-patches.patch deleted file mode 100644 index ed917cd..0000000 --- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0001-Roll-up-TIS-patches.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 94cc61ad7f76d94791fee4f596d3c8c3124c0526 Mon Sep 17 00:00:00 2001 -From: Don Penney -Date: Wed, 11 Jan 2017 14:25:20 -0500 -Subject: [PATCH] Roll up TIS patches - ---- - manifests/params.pp | 2 +- - manifests/server/config.pp | 8 ++++++-- - manifests/server/initdb.pp | 9 +++++++++ - 3 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/manifests/params.pp b/manifests/params.pp -index d40a1eb..45be360 100644 ---- a/manifests/params.pp -+++ b/manifests/params.pp -@@ -74,7 +74,7 @@ class postgresql::params inherits postgresql::globals { - } - $psql_path = pick($psql_path, "${bindir}/psql") - -- $service_status = $service_status -+ $service_status = "systemctl is-active postgresql" - $service_reload = "service ${service_name} reload" - $perl_package_name = pick($perl_package_name, 'perl-DBD-Pg') - $python_package_name = pick($python_package_name, 'python-psycopg2') -diff --git a/manifests/server/config.pp b/manifests/server/config.pp -index 205dd22..2ecad4b 100644 ---- a/manifests/server/config.pp -+++ b/manifests/server/config.pp -@@ -111,6 +111,12 @@ class postgresql::server::config { - postgresql::server::config_entry { 'data_directory': - value => $datadir, - } -+ postgresql::server::config_entry { 'hba_file': -+ value => $pg_hba_conf_path, -+ } -+ postgresql::server::config_entry { 'ident_file': -+ value => $pg_ident_conf_path, -+ } - if $timezone { - postgresql::server::config_entry { 'timezone': - value => $timezone, -@@ -154,7 +160,6 @@ class postgresql::server::config { - concat { $pg_ident_conf_path: - owner => $user, - group => $group, -- force => true, # do not crash if there is no pg_ident_rules - mode => '0640', - warn => true, - notify => Class['postgresql::server::reload'], -@@ -165,7 +170,6 @@ class postgresql::server::config { - concat { $recovery_conf_path: - owner => $user, - group => $group, -- force => true, # do not crash if there is no recovery conf file - mode => '0640', - warn => true, - notify => Class['postgresql::server::reload'], -diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp -index 2252a19..5e263e3 100644 ---- a/manifests/server/initdb.pp -+++ b/manifests/server/initdb.pp -@@ -3,6 +3,7 @@ class postgresql::server::initdb { - $needs_initdb = $postgresql::server::needs_initdb - $initdb_path = $postgresql::server::initdb_path - $datadir = $postgresql::server::datadir -+ $confdir = $postgresql::server::confdir - $xlogdir = $postgresql::server::xlogdir - $logdir = $postgresql::server::logdir - $encoding = $postgresql::server::encoding -@@ -41,6 +42,14 @@ class postgresql::server::initdb { - seltype => $seltype, - } - -+ # Make sure the conf directory exists, and has the correct permissions. -+ file { $confdir: -+ ensure => directory, -+ owner => $user, -+ group => $group, -+ mode => '0700', -+ } -+ - if($xlogdir) { - # Make sure the xlog directory exists, and has the correct permissions. - file { $xlogdir: --- -1.8.3.1 - diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0002-remove-puppetlabs-apt-as-a-requirement.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0002-remove-puppetlabs-apt-as-a-requirement.patch deleted file mode 100644 index d19b49c..0000000 --- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0002-remove-puppetlabs-apt-as-a-requirement.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dd019f3e222c799afff53cb00447c130839f7d39 Mon Sep 17 00:00:00 2001 -From: Al Bailey -Date: Wed, 3 Jan 2018 14:11:08 -0600 -Subject: [PATCH] remove puppetlabs-apt as a requirement - ---- - metadata.json | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/metadata.json b/metadata.json -index 2a59dc9..b1de7f0 100644 ---- a/metadata.json -+++ b/metadata.json -@@ -9,7 +9,6 @@ - "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", - "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":"4.x"}, -- {"name":"puppetlabs/apt","version_requirement":">=1.8.0 <3.0.0"}, - {"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <3.0.0"} - ], - "data_provider": null, --- -1.8.3.1 - diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bbappend b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bbappend index e9567c0..67cbea3 100644 --- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bbappend +++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-postgresql_git.bbappend @@ -1,8 +1,14 @@ +inherit stx-metadata + +STX_REPO = "integ" +STX_SUBPATH = "config/puppet-modules/puppet-postgresql-${PV}/centos/files" + +SRC_URI_STX += " \ + file://0001-Roll-up-TIS-patches.patch \ + file://0002-remove-puppetlabs-apt-as-a-requirement.patch \ + " -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += " \ - file://${BPN}/0001-Roll-up-TIS-patches.patch \ - file://${BPN}/0002-remove-puppetlabs-apt-as-a-requirement.patch \ file://${BPN}/0003-puppetlabs-postgresql-account-for-naming-diffs.patch \ file://${BPN}/0004-poky-postgresql-updates.patch \ file://${BPN}/0005-puppetlabs-postgresql-poky.patch \ @@ -10,8 +16,6 @@ SRC_URI += " \ file://${BPN}/postgresql.service \ " -# file://${PN}/0004-postgresql-service-restart-with-systemctl.patch - RDEPENDS_${PN}_append = " \ postgresql \ postgresql-contrib \ @@ -27,7 +31,7 @@ RDEPENDS_${PN}_append = " \ do_install_append() { install -d -m0755 ${D}/usr/lib/systemd/system - install -m0644 ${WORKDIR}/${PN}/postgresql.service ${D}/usr/lib/systemd/system + install -m0644 ${WORKDIR}/${BPN}/postgresql.service ${D}/usr/lib/systemd/system } FILES_${PN}_append = " /usr/lib/systemd/system/postgresql.service"