From 0bd52cb6fbdb83c5eee722e4788519e1c0c10b46 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 16 Feb 2021 14:48:56 +0100
Subject: [PATCH] Fixes #31834 - Use PostgreSQL 12 on EL8

This aligns Red Hat 7 and Red Hat 8 on PostgreSQL 12. It uses the
a specific git commit for DNF module support but without dropping Puppet
5 to allow for a cherry pick to 2.4. After develop drops Puppet 5
support, it should switch to >= 7.0.1 as a version specifyer.

It may break existing installations on PostgreSQL 10 since there is no
upgrade path. Those users are recommended to set version to 10 in their
custom-hiera.yaml or upgrade to PostgreSQL 12.
---
 Puppetfile                                | 3 ++-
 config/foreman.hiera/family/RedHat-8.yaml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Puppetfile b/Puppetfile
index fecf558cf..fc328f109 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,7 +1,8 @@
 forge 'https://forgeapi.puppetlabs.com/'
 
 # Dependencies
-mod 'puppetlabs/postgresql',         '>= 6.10.1'
+# This uses a version with DNF module support but without dropping Puppet 5
+mod 'puppetlabs/postgresql',         :git => 'https://github.com/theforeman/puppetlabs-postgresql', :commit => '8d0efec9fb5a5df42ed64375c71a11d8b6f90b4c'
 mod 'theforeman/dhcp',               :git => 'https://github.com/theforeman/puppet-dhcp'
 mod 'theforeman/dns',                :git => 'https://github.com/theforeman/puppet-dns'
 mod 'theforeman/git',                :git => 'https://github.com/theforeman/puppet-git'
diff --git a/config/foreman.hiera/family/RedHat-8.yaml b/config/foreman.hiera/family/RedHat-8.yaml
index bb6e7be93..26abcd0f5 100644
--- a/config/foreman.hiera/family/RedHat-8.yaml
+++ b/config/foreman.hiera/family/RedHat-8.yaml
@@ -5,3 +5,6 @@ apache::mod::ssl::ssl_protocol:
   - 'ALL'
   - '-TLSv1'
   - '-TLSv1.1'
+
+postgresql::globals::manage_dnf_module: true
+postgresql::globals::version: "12"