From aa3805bb5e8e057d541f34344b912e8abba7718f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 10 Dec 2023 00:01:12 +0900
Subject: [PATCH] CentOS/RHEL: Deprecate EPEL repository setup

EPEL is not required to use RDO. Users can use a different module such
as puppet-epel[1] if they really need EPEL for any other purpose.

[1] https://github.com/voxpupuli/puppet-epel

Change-Id: I9743e2711f64cff8c0636c1556cb1e943413fdad
---
 manifests/repo/redhat/redhat.pp               | 19 ++++++++++++-------
 ...eprecate-manage_epel-056acc6686886a4a.yaml |  5 +++++
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-manage_epel-056acc6686886a4a.yaml

diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp
index 5bad67c..77622aa 100644
--- a/manifests/repo/redhat/redhat.pp
+++ b/manifests/repo/redhat/redhat.pp
@@ -14,12 +14,6 @@
 #   RDO OpenStack repository.
 #   Defaults to true
 #
-# [*manage_epel*]
-#   (Optional) Whether to create a predefined yumrepo resource for
-#   the EPEL repository. Note EPEL is not required for deploying
-#   OpenStack with RDO.
-#   Defaults to false
-#
 # [*repo_hash*]
 #   (Optional) A hash of yumrepo resources that will be passed to
 #   create_resource. See examples folder for some useful examples.
@@ -69,10 +63,17 @@
 #   (Optional) Timeout for package update.
 #   Defaults to 600
 #
+# DEPRECATED PARAMETER
+#
+# [*manage_epel*]
+#   (Optional) Whether to create a predefined yumrepo resource for
+#   the EPEL repository. Note EPEL is not required for deploying
+#   OpenStack with RDO.
+#   Defaults to false
+#
 class openstack_extras::repo::redhat::redhat (
   String[1] $release           = 'bobcat',
   Boolean $manage_rdo          = true,
-  Boolean $manage_epel         = false,
   Hash $repo_hash              = {},
   Hash $repo_source_hash       = {},
   Boolean $repo_replace        = true,
@@ -84,6 +85,8 @@ class openstack_extras::repo::redhat::redhat (
   String[1] $centos_mirror_url = 'http://mirror.stream.centos.org',
   Boolean $update_packages     = false,
   Integer[0] $update_timeout   = 600,
+  # DEPRECATED PARAMETERS
+  Boolean $manage_epel         = false,
 ) {
 
   validate_yum_hash($repo_hash)
@@ -130,6 +133,8 @@ class openstack_extras::repo::redhat::redhat (
   }
 
   if $manage_epel {
+    warning('The manage_epel parameter has been deprecated and will be removed in a future release')
+
     $epel_hash = {
       'epel' => {
         'metalink'       => "https://mirrors.fedoraproject.org/metalink?repo=epel-${facts['os']['release']['major']}&arch=\$basearch",
diff --git a/releasenotes/notes/deprecate-manage_epel-056acc6686886a4a.yaml b/releasenotes/notes/deprecate-manage_epel-056acc6686886a4a.yaml
new file mode 100644
index 0000000..6f436d4
--- /dev/null
+++ b/releasenotes/notes/deprecate-manage_epel-056acc6686886a4a.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``openstack_extras::repo::redhat::redhat::manage_epel`` parameter has
+    been deprecated and will be removed in a future release.