From d7e3934aaf43afcf17eab15f6c38f8c363abb5ef Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 19 Apr 2024 01:17:57 +0900
Subject: [PATCH] mdns: Clean up deprecated parameters

These parameters were deprecated during the previous cycle.

Change-Id: If430c7278c86c8be8a11834260ca13883a09d4eb
---
 manifests/mdns.pp                             | 46 -------------------
 ...ns-cleanup-dalmetian-7588fb88c4df856a.yaml | 10 ++++
 2 files changed, 10 insertions(+), 46 deletions(-)
 create mode 100644 releasenotes/notes/mdns-cleanup-dalmetian-7588fb88c4df856a.yaml

diff --git a/manifests/mdns.pp b/manifests/mdns.pp
index 27db3ece..841cdb4e 100644
--- a/manifests/mdns.pp
+++ b/manifests/mdns.pp
@@ -48,24 +48,6 @@
 #   (Optional) mDNS host:port pairs to listen on.
 #   Defaults to $facts['os_service_default'].
 #
-# DEPRECATED PARAMETERS
-#
-# [*topic*]
-#   (Optional) RPC topic name for mdns.
-#   Defaults to undef.
-#
-# [*all_tcp*]
-#   (Optional) Send all traffic over TCP.
-#   Defaults to undef.
-#
-# [*xfr_timeout*]
-#   (Optional) Timeout in seconds for XFR's.
-#   Defaults to undef.
-#
-# [*storage_driver*]
-#   (Optional) The storage driver to use.
-#   Defaults to undef.
-#
 class designate::mdns (
   $package_ensure         = present,
   $mdns_package_name      = $::designate::params::mdns_package_name,
@@ -78,31 +60,11 @@ class designate::mdns (
   $query_enforce_tsig     = $facts['os_service_default'],
   $max_message_size       = $facts['os_service_default'],
   $listen                 = $facts['os_service_default'],
-  # DEPRECATED PARAMETERS
-  $topic                  = undef,
-  $all_tcp                = undef,
-  $xfr_timeout            = undef,
-  $storage_driver         = undef,
 ) inherits designate::params {
 
   include designate::deps
   include designate::db
 
-  if $topic != undef {
-    warning('The topic parameter is deprecated and has no effect')
-  }
-
-  ['all_tcp', 'xfr_timeout'].each |$opt| {
-    if getvar($opt) != undef {
-      warning("The designate::mdns::${opt} parameter is deprecated and has no effect. \
-Use the designate::worker::${opt} parameter instead.")
-    }
-  }
-
-  if $storage_driver {
-    warning('The storage driver parameter is deprecated and has no effect')
-  }
-
   designate_config {
     'service:mdns/workers'            : value => $workers;
     'service:mdns/threads'            : value => $threads;
@@ -113,14 +75,6 @@ Use the designate::worker::${opt} parameter instead.")
     'service:mdns/listen'             : value => join(any2array($listen), ',');
   }
 
-  # TODO(tkajinam): Remove this after 2024.1 release.
-  designate_config {
-    'service:mdns/all_tcp'       : ensure => absent;
-    'service:mdns/topic'         : ensure => absent;
-    'service:mdns/xfr_timeout'   : ensure => absent;
-    'service:mdns/storage_driver': ensure => absent;
-  }
-
   designate::generic_service { 'mdns':
     enabled        => $enabled,
     manage_service => $manage_service,
diff --git a/releasenotes/notes/mdns-cleanup-dalmetian-7588fb88c4df856a.yaml b/releasenotes/notes/mdns-cleanup-dalmetian-7588fb88c4df856a.yaml
new file mode 100644
index 00000000..a668e85a
--- /dev/null
+++ b/releasenotes/notes/mdns-cleanup-dalmetian-7588fb88c4df856a.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    The following deprecated parameters of the ``designate::mdns`` class have
+    been removed.
+
+    - ``topic``
+    - ``all_tcp``
+    - ``xfr_timeout``
+    - ``storage_driver``