From 3134f475ab516887d25792764bd4cd7e3bff6d9f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 25 Apr 2020 23:26:44 +0900
Subject: [PATCH] Deprecate designate::worker::worker_notify

... because its actual parameter in designate was already deprecated in
designate.[1]

[1] 52ad1c4c13d1fead646435634e4b07bb32c68d28

Change-Id: If22e4f75a0959507d6d3a97036f873df2f284d03
---
 manifests/worker.pp                           | 22 ++++++++++++++-----
 ...recate-worker-notify-f93ccf263b03c974.yaml |  5 +++++
 spec/classes/designate_worker_spec.rb         |  1 -
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-worker-notify-f93ccf263b03c974.yaml

diff --git a/manifests/worker.pp b/manifests/worker.pp
index 740fd3aa..f1ce6c0b 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -53,10 +53,6 @@
 #   (optional) Poll delay.
 #   Defaults to $::os_service_default
 #
-# [*worker_notify*]
-#   (optional) Whether to allow worker to send NOTIFYs.
-#   Defaults to $::os_service_default
-#
 # [*export_synchronous*]
 #   (optional) Whether to allow synchronous zone exports.
 #   Defaults to $::os_service_default
@@ -65,6 +61,13 @@
 #   (optional) RPC topic for worker component.
 #   Defaults to $::os_service_default
 #
+# DEPRECATED PARAMETERS
+#
+# [*worker_notify*]
+#
+#   (optional) Whether to allow worker to send NOTIFYs.
+#   Defaults to undef
+#
 class designate::worker(
   $manage_package       = true,
   $package_ensure       = present,
@@ -78,9 +81,10 @@ class designate::worker(
   $poll_retry_interval  = $::os_service_default,
   $poll_max_retries     = $::os_service_default,
   $poll_delay           = $::os_service_default,
-  $worker_notify        = $::os_service_default,
   $export_synchronous   = $::os_service_default,
   $worker_topic         = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $worker_notify        = undef,
 ) {
 
   include designate::deps
@@ -111,9 +115,15 @@ class designate::worker(
     'service:worker/poll_retry_interval':  value => $poll_retry_interval;
     'service:worker/poll_max_retries':     value => $poll_max_retries;
     'service:worker/poll_delay':           value => $poll_delay;
-    'service:worker/notify':               value => $worker_notify;
     'service:worker/export_synchronous':   value => $export_synchronous;
     'service:worker/worker_topic':         value => $worker_topic;
     'service:worker/enabled':              value => $enabled;
   }
+
+  if $worker_notify != undef {
+    warning('worker_notify is deprecated nad will be removed in a future release')
+    designate_config {
+      'service:worker/notify': value => $worker_notify;
+    }
+  }
 }
diff --git a/releasenotes/notes/deprecate-worker-notify-f93ccf263b03c974.yaml b/releasenotes/notes/deprecate-worker-notify-f93ccf263b03c974.yaml
new file mode 100644
index 00000000..5ed386ee
--- /dev/null
+++ b/releasenotes/notes/deprecate-worker-notify-f93ccf263b03c974.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The designate::worker::worker_notify parameter has been deprecated because
+    its actual parameter in designate was alreday rdeprecated.
diff --git a/spec/classes/designate_worker_spec.rb b/spec/classes/designate_worker_spec.rb
index 9c120d3b..000cccc9 100644
--- a/spec/classes/designate_worker_spec.rb
+++ b/spec/classes/designate_worker_spec.rb
@@ -55,7 +55,6 @@ describe 'designate::worker' do
         is_expected.to contain_designate_config('service:worker/poll_retry_interval').with_value( '<SERVICE DEFAULT>' )
         is_expected.to contain_designate_config('service:worker/poll_max_retries').with_value( '<SERVICE DEFAULT>' )
         is_expected.to contain_designate_config('service:worker/poll_delay').with_value( '<SERVICE DEFAULT>' )
-        is_expected.to contain_designate_config('service:worker/notify').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/worker_topic').with_value( '<SERVICE DEFAULT>' )
         is_expected.to contain_designate_config('service:worker/enabled').with_value( 'true' )