From bdf0f42d522d79266c3292005866de8ed0285112 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 10 Nov 2022 00:41:24 +0900
Subject: [PATCH] CentOS: Remove deprecated parameters

These parameters were deprecated during the past cycles and have no
effect since support for CentOS 8 has been completely removed.

Change-Id: I46cf7b3ae2e2d0cc8521653a1eba5ddb20d7e0eb
---
 manifests/repo/redhat/redhat.pp               | 23 -------------------
 ...epo-cleanup-antelope-ca46c38bbf3ee957.yaml |  8 +++++++
 2 files changed, 8 insertions(+), 23 deletions(-)
 create mode 100644 releasenotes/notes/redhat-repo-cleanup-antelope-ca46c38bbf3ee957.yaml

diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp
index cd14e23..f823308 100644
--- a/manifests/repo/redhat/redhat.pp
+++ b/manifests/repo/redhat/redhat.pp
@@ -65,18 +65,6 @@
 #   configured.
 #   Defaults to false
 #
-# DEPRECATED PARAMS
-# =================
-#
-# [*stream*]
-#   (Optional) Is this CentOS Stream and should we adjust mirrors.
-#   Defaults to undef
-#
-# [*manage_virt*]
-#   (Optional) Whether to create a yumrepo resource for the
-#   Advanced Virtualization repository.
-#   Defaults to undef
-#
 class openstack_extras::repo::redhat::redhat (
   $release           = $openstack_extras::repo::redhat::params::release,
   $manage_rdo        = true,
@@ -91,9 +79,6 @@ class openstack_extras::repo::redhat::redhat (
   $package_require   = false,
   $centos_mirror_url = $openstack_extras::repo::redhat::params::centos_mirror_url,
   $update_packages   = false,
-  # DEPRECATED PARAMS
-  $stream            = undef,
-  $manage_virt       = undef,
 ) inherits openstack_extras::repo::redhat::params {
 
   validate_legacy(String, 'validate_string', $release)
@@ -108,14 +93,6 @@ class openstack_extras::repo::redhat::redhat (
   validate_legacy(Boolean, 'validate_bool', $package_require)
   validate_yum_hash($repo_hash)
 
-  if $stream != undef {
-    warning('The stream parmeter has been deprecated and has no effect.')
-  }
-
-  if $manage_virt != undef {
-    warning('The manage_virt parameter has been deprecatd and has no effect.')
-  }
-
   $_repo_defaults = merge($openstack_extras::repo::redhat::params::repo_defaults, $repo_defaults)
   $_gpgkey_defaults = merge($openstack_extras::repo::redhat::params::gpgkey_defaults, $gpgkey_defaults)
 
diff --git a/releasenotes/notes/redhat-repo-cleanup-antelope-ca46c38bbf3ee957.yaml b/releasenotes/notes/redhat-repo-cleanup-antelope-ca46c38bbf3ee957.yaml
new file mode 100644
index 0000000..64a9f60
--- /dev/null
+++ b/releasenotes/notes/redhat-repo-cleanup-antelope-ca46c38bbf3ee957.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``openstack_extras::repo::redhat::redhat``
+    class have been removed.
+
+    - ``stream``
+    - ``manage_virt``