From a628765b275f065b0a90dfd0cf671ce57c84b42e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 23 Oct 2023 23:07:46 +0900
Subject: [PATCH] Move some options from mdns to worker

... following the migration in designate itself.

Backport note:
This change skips deprecating the existing parameters and only adds
the new designate::worker class parameters.

Depends-on: https://review.opendev.org/c/openstack/designate/+/845508
Change-Id: I6528d7cbae72b8f6f9ae8d26f9258f3b9e82e560
(cherry picked from commit 68ceda6a231d0024d08652bb7197d0c5347da2a5)
---
 manifests/worker.pp                                  | 12 ++++++++++++
 .../notes/mdns-rpc-moved-bf1a837b67c41c4b.yaml       |  8 ++++++++
 spec/classes/designate_worker_spec.rb                |  6 ++++++
 3 files changed, 26 insertions(+)
 create mode 100644 releasenotes/notes/mdns-rpc-moved-bf1a837b67c41c4b.yaml

diff --git a/manifests/worker.pp b/manifests/worker.pp
index 378971bb..c881bbb2 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -56,6 +56,14 @@
 #   (optional) RPC topic for worker component.
 #   Defaults to $facts['os_service_default']
 #
+# [*xfr_timeout*]
+#   (Optional) Timeout in seconds for XFR's.
+#   Defaults to $facts['os_service_default']
+#
+# [*all_tcp*]
+#   (Optional) Send all traffic over TCP.
+#   Defaults to $facts['os_service_default']
+#
 class designate::worker(
   $package_ensure         = present,
   $worker_package_name    = $::designate::params::worker_package_name,
@@ -70,6 +78,8 @@ class designate::worker(
   $poll_delay             = $facts['os_service_default'],
   $export_synchronous     = $facts['os_service_default'],
   $topic                  = $facts['os_service_default'],
+  $xfr_timeout            = $facts['os_service_default'],
+  $all_tcp                = $facts['os_service_default'],
 ) inherits designate::params {
 
   include designate::deps
@@ -92,5 +102,7 @@ class designate::worker(
     'service:worker/poll_delay':           value => $poll_delay;
     'service:worker/export_synchronous':   value => $export_synchronous;
     'service:worker/topic':                value => $topic;
+    'service:worker/xfr_timeout':          value => $xfr_timeout;
+    'service:worker/all_tcp':              value => $all_tcp;
   }
 }
diff --git a/releasenotes/notes/mdns-rpc-moved-bf1a837b67c41c4b.yaml b/releasenotes/notes/mdns-rpc-moved-bf1a837b67c41c4b.yaml
new file mode 100644
index 00000000..238c390d
--- /dev/null
+++ b/releasenotes/notes/mdns-rpc-moved-bf1a837b67c41c4b.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    The following parameters have been added to the ``designate::worker``
+    class.
+
+    - ``all_tcp``
+    - ``xfer_timeout``
diff --git a/spec/classes/designate_worker_spec.rb b/spec/classes/designate_worker_spec.rb
index ffdd031f..1d844766 100644
--- a/spec/classes/designate_worker_spec.rb
+++ b/spec/classes/designate_worker_spec.rb
@@ -23,6 +23,8 @@ describe 'designate::worker' do
       :poll_delay           => 1,
       :export_synchronous   => true,
       :topic                => 'topic',
+      :xfr_timeout          => 10,
+      :all_tcp              => true,
     }
   end
 
@@ -54,6 +56,8 @@ describe 'designate::worker' do
         is_expected.to contain_designate_config('service:worker/poll_delay').with_value( '<SERVICE DEFAULT>' )
         is_expected.to contain_designate_config('service:worker/export_synchronous').with_value( '<SERVICE DEFAULT>' )
         is_expected.to contain_designate_config('service:worker/topic').with_value( '<SERVICE DEFAULT>' )
+        is_expected.to contain_designate_config('service:worker/xfr_timeout').with_value( '<SERVICE DEFAULT>' )
+        is_expected.to contain_designate_config('service:worker/all_tcp').with_value( '<SERVICE DEFAULT>' )
       end
     end
 
@@ -86,6 +90,8 @@ describe 'designate::worker' do
         is_expected.to contain_designate_config('service:worker/poll_delay').with_value( params[:poll_delay] )
         is_expected.to contain_designate_config('service:worker/export_synchronous').with_value( params[:export_synchronous] )
         is_expected.to contain_designate_config('service:worker/topic').with_value( params[:topic] )
+        is_expected.to contain_designate_config('service:worker/xfr_timeout').with_value( params[:xfr_timeout] )
+        is_expected.to contain_designate_config('service:worker/all_tcp').with_value( params[:all_tcp] )
       end
     end