From 38443b36cb75e4ccf2ed3a2589e343bc0fe62909 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 11 Oct 2021 13:49:38 +0200
Subject: [PATCH 1/2] Drop puppet 5 repos

---
 prod.repos.d/puppetlabs.repo | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/prod.repos.d/puppetlabs.repo b/prod.repos.d/puppetlabs.repo
index 5b47526..e0ba456 100644
--- a/prod.repos.d/puppetlabs.repo
+++ b/prod.repos.d/puppetlabs.repo
@@ -1,18 +1,4 @@
 
-[puppet5_el7]
-name=Puppet 5 Repository el 7 - x86_64
-baseurl=http://yum.puppetlabs.com/puppet5/el/7/x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
-enabled=1
-gpgcheck=1
-
-[puppet5_el8]
-name=Puppet 5 Repository el 8 - x86_64
-baseurl=http://yum.puppetlabs.com/puppet5/el/8/x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
-enabled=1
-gpgcheck=1
-
 [puppet6_el7]
 name=Puppet 6 Repository el 7 - x86_64
 baseurl=http://yum.puppetlabs.com/puppet6/el/7/x86_64/
-- 
GitLab


From b3bb3c2377451bda7864118001f7a1278e52551f Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 11 Oct 2021 13:51:02 +0200
Subject: [PATCH 2/2] Enable puppetlabs puppet7 repos

---
 prod.repos.d/puppetlabs.repo | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/prod.repos.d/puppetlabs.repo b/prod.repos.d/puppetlabs.repo
index e0ba456..951a0ae 100644
--- a/prod.repos.d/puppetlabs.repo
+++ b/prod.repos.d/puppetlabs.repo
@@ -13,3 +13,16 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
 enabled=1
 gpgcheck=1
 
+[puppet7_el7]
+name=Puppet 7 Repository el 7 - x86_64
+baseurl=http://yum.puppetlabs.com/puppet7/el/7/x86_64/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
+enabled=1
+gpgcheck=1
+
+[puppet7_el8]
+name=Puppet 7 Repository el 8 - x86_64
+baseurl=http://yum.puppetlabs.com/puppet7/el/8/x86_64/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet
+enabled=1
+gpgcheck=1
-- 
GitLab