From b36ef4fab8b807e1e2d5980fa6942974a8206097 Mon Sep 17 00:00:00 2001 From: Daniel Stevens Torres Cardenas Date: Thu, 11 Nov 2021 15:04:18 +0000 Subject: [PATCH] Revert "Add centos package for puppet-postgresql module" This reverts commit d27206ec923f814018b3cde4e1106007c6cbac69. Reason for revert: We have a red sanity and we believe it this is the commit that is causing ansible to fail. Change-Id: Ia0ef3bb302be88e04849cd0343fd849895c455f0 --- centos_pkg_dirs | 2 +- centos_tarball-dl.lst | 2 +- .../centos/build_srpm.data | 4 +- .../files/0001-Roll-up-TIS-patches.patch | 87 +++++++++++++++++++ ...move-puppetlabs-apt-as-a-requirement.patch | 24 +++++ .../centos/puppet-postgresql.spec | 4 +- .../files/0001-Roll-up-TIS-patches.patch | 73 ---------------- ...move-puppetlabs-apt-as-a-requirement.patch | 29 ------- 8 files changed, 117 insertions(+), 108 deletions(-) rename config/puppet-modules/{puppetlabs-postgresql-6.7.0 => puppet-postgresql-4.8.0}/centos/build_srpm.data (72%) create mode 100644 config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch create mode 100644 config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch rename config/puppet-modules/{puppetlabs-postgresql-6.7.0 => puppet-postgresql-4.8.0}/centos/puppet-postgresql.spec (94%) delete mode 100644 config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0001-Roll-up-TIS-patches.patch delete mode 100644 config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch diff --git a/centos_pkg_dirs b/centos_pkg_dirs index ba51bac9b..53369f28d 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -36,7 +36,7 @@ config/puppet-modules/puppet-ldap config/puppet-modules/puppet-lvm config/puppet-modules/puppet-network config/puppet-modules/puppet-nslcd -config/puppet-modules/puppetlabs-postgresql-6.7.0 +config/puppet-modules/puppet-postgresql-4.8.0 config/puppet-modules/puppet-puppi config/puppet-modules/puppet-rabbitmq-5.5.0 config/puppet-modules/puppet-staging diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index 40364e486..e4da861fc 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -61,7 +61,7 @@ puppet-filemapper-9b53310278e76827bbe12a36cc6470d77071abb2.tar.gz#packstack/pupp puppetlabs-create_resources-4639819a7f3a4fa9310d2ba583c63e467df7e2c3.tar.gz#packstack/puppet/modules/create_resources#https://github.com/puppetlabs/puppetlabs-create_resources/tarball/4639819a7f3a4fa9310d2ba583c63e467df7e2c3#http## puppetlabs-drbd-496b3ba9cd74a2d12636f9e90a718739a5451169.tar.gz#puppetlabs-drbd#https://github.com/voxpupuli/puppet-drbd/tarball/496b3ba9cd74a2d12636f9e90a718739a5451169#http## puppetlabs-lvm-d0283da637ae24550fb4ba109a48ef8d5d8c8b84.tar.gz#packstack/puppet/modules/lvm#https://github.com/puppetlabs/puppetlabs-lvm/tarball/d0283da637ae24550fb4ba109a48ef8d5d8c8b84#http## -puppetlabs-postgresql-3f80054a342cccb5d368be4cea64c67e09a8d4d6.tar.gz#puppetlabs-postgresql#https://github.com/puppetlabs/puppetlabs-postgresql/tarball/3f80054a342cccb5d368be4cea64c67e09a8d4d6#http## +puppetlabs-postgresql-d022a56b28b2174456fc0f6adc51a4b54493afad.tar.gz#puppetlabs-postgresql#https://github.com/puppetlabs/puppetlabs-postgresql/tarball/d022a56b28b2174456fc0f6adc51a4b54493afad#http## puppet-ldap-480f13af6d17d1d3fcf0dc7b4bd04b49fa4099e1.tar.gz#puppet-ldap-master#https://github.com/torian/puppet-ldap/tarball/480f13af6d17d1d3fcf0dc7b4bd04b49fa4099e1#http## puppet-network-7deacd5fdc22c0543455878a8d1872f2f5417c1d.tar.gz#packstack/puppet/modules/network#https://github.com/voxpupuli/puppet-network/tarball/7deacd5fdc22c0543455878a8d1872f2f5417c1d#http## puppet-nslcd-b8c19b1ada89865f2e50758e054583798ad8011a.tar.gz#packstack/puppet/modules/nslcd#https://github.com/jlyheden/puppet-nslcd/tarball/b8c19b1ada89865f2e50758e054583798ad8011a#http## diff --git a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/build_srpm.data b/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data similarity index 72% rename from config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/build_srpm.data rename to config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data index 356b4be21..60d1412dc 100644 --- a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/build_srpm.data +++ b/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data @@ -1,8 +1,8 @@ PREFIX=puppetlabs MODULE=postgresql -VERSION=6.7.0 +VERSION=4.8.0 -GIT_SHA=3f80054a342cccb5d368be4cea64c67e09a8d4d6 +GIT_SHA=d022a56b28b2174456fc0f6adc51a4b54493afad #Patched COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BASE/*" diff --git a/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch new file mode 100644 index 000000000..ed917cd8d --- /dev/null +++ b/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch @@ -0,0 +1,87 @@ +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/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch b/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch new file mode 100644 index 000000000..d19b49c6a --- /dev/null +++ b/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch @@ -0,0 +1,24 @@ +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/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/puppet-postgresql.spec b/config/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec similarity index 94% rename from config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/puppet-postgresql.spec rename to config/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec index 5742b6bcf..e794318c7 100644 --- a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/puppet-postgresql.spec +++ b/config/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec @@ -1,9 +1,9 @@ -%global git_sha 3f80054a342cccb5d368be4cea64c67e09a8d4d6 +%global git_sha d022a56b28b2174456fc0f6adc51a4b54493afad %global prefix puppetlabs %global module_dir postgresql Name: puppet-%{module_dir} -Version: 6.7.0 +Version: 4.8.0 Release: 0%{?_tis_dist}.%{tis_patch_ver} Summary: Puppet %{module_dir} module License: Apache diff --git a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0001-Roll-up-TIS-patches.patch deleted file mode 100644 index 9b1708616..000000000 --- a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0001-Roll-up-TIS-patches.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 38a49b6342027ef1f0052f6ef2074cb8a1b06fca Mon Sep 17 00:00:00 2001 -From: Roberto Luiz Martins Nogueira - -Date: Sun, 7 Nov 2021 10:31:04 -0300 -Subject: [PATCH] Roll-up-TIS-patches - -Signed-off-by: Roberto Luiz Martins Nogueira ---- - manifests/params.pp | 2 +- - manifests/server/config.pp | 6 ++++++ - manifests/server/initdb.pp | 9 +++++++++ - 3 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/manifests/params.pp b/manifests/params.pp -index 15b72bd..9e72600 100644 ---- a/manifests/params.pp -+++ b/manifests/params.pp -@@ -144,7 +144,7 @@ class postgresql::params inherits postgresql::globals { - $confdir = pick($confdir, $datadir) - $psql_path = pick($psql_path, "${bindir}/psql") - -- $service_status = $service_status -+ $service_status = "systemctl is-active postgresql" - $service_reload = "systemctl reload ${service_name}" - $python_package_name = pick($python_package_name, 'python-psycopg2') - # Archlinux does not have a perl::DBD::Pg package -diff --git a/manifests/server/config.pp b/manifests/server/config.pp -index 93bc9b9..e5f44e1 100644 ---- a/manifests/server/config.pp -+++ b/manifests/server/config.pp -@@ -149,6 +149,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, -diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp -index a73186d..7ab7912 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 - $manage_datadir = $postgresql::server::manage_datadir -@@ -56,6 +57,14 @@ class postgresql::server::initdb { - } - } - -+ # Make sure the conf directory exists, and has the correct permissions. -+ file { $confdir: -+ ensure => directory, -+ owner => $user, -+ group => $group, -+ mode => '0700', -+ } -+ - if($xlogdir) { - if($manage_xlogdir) { - # Make sure the xlog directory exists, and has the correct permissions. --- -2.17.1 - diff --git a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch b/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch deleted file mode 100644 index 3e092b297..000000000 --- a/config/puppet-modules/puppetlabs-postgresql-6.7.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9f7b9e1c206c7a77015094314bc5992a36239fd7 Mon Sep 17 00:00:00 2001 -From: Roberto Luiz Martins Nogueira - -Date: Sun, 7 Nov 2021 10:53:36 -0300 -Subject: [PATCH] remove-puppetlabs-apt-as-a-requirement - -Signed-off-by: Roberto Luiz Martins Nogueira ---- - metadata.json | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/metadata.json b/metadata.json -index dc1cc66..1aa48b2 100644 ---- a/metadata.json -+++ b/metadata.json -@@ -12,10 +12,6 @@ - "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 7.0.0" - }, -- { -- "name": "puppetlabs/apt", -- "version_requirement": ">= 2.0.0 < 8.0.0" -- }, - { - "name": "puppetlabs/concat", - "version_requirement": ">= 4.1.0 < 7.0.0" --- -2.17.1 -