From bfad5e4dff2204a55d43f5acbfd1c60fa03dfa7a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 13 Jun 2022 02:11:52 +0900
Subject: [PATCH] Remove deprecated manage_whz

... because it was deprecated several cycles ago[1].

[1] 9b63dc312ee289681106573d542b7c3a1e4a0ead

Change-Id: I60e37d1c555422c65760705377a7f9c469142e3f
---
 manifests/repo/debian/debian.pp                     | 13 +------------
 ...o-debian-remove-manage_whz-73b1326b754dfe30.yaml |  5 +++++
 2 files changed, 6 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml

diff --git a/manifests/repo/debian/debian.pp b/manifests/repo/debian/debian.pp
index d4e9789..d4f4ad3 100644
--- a/manifests/repo/debian/debian.pp
+++ b/manifests/repo/debian/debian.pp
@@ -40,12 +40,6 @@
 #   (optional) Debian package repository location.
 #   Defaults to "http://${::lsbdistcodename}-${release}.debian.net/debian"
 #
-# === DEPRECATED
-#
-# [*manage_whz*]
-#   (optional) Whether or not to add the default Debian Stretch APT source
-#   Replaced by $manage_deb.
-#
 class openstack_extras::repo::debian::debian(
   $release         = $::openstack_extras::repo::debian::params::release,
   $manage_deb      = true,
@@ -55,16 +49,11 @@ class openstack_extras::repo::debian::debian(
   $source_hash     = {},
   $source_defaults = {},
   $deb_location    = "http://${::lsbdistcodename}-${release}.debian.net/debian",
-  # DEPRECATED
-  $manage_whz      = undef,
 ) inherits openstack_extras::repo::debian::params {
-  # handle deprecation
-  $deb_manage = pick($manage_whz, $manage_deb)
 
   $lowercase_release = downcase($release)
 
-
-  if $deb_manage {
+  if $manage_deb {
 
     if $use_extrepo {
       # Extrepo is much nicer than what's below, because
diff --git a/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml b/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml
new file mode 100644
index 0000000..4bf618e
--- /dev/null
+++ b/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``openstack_extras::repo::debian::debian::manage_whz`` parameter has
+    been removed.