From d4550c5b6e0e4d3d60d03d3945ce6e221d1b5d65 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 5 Aug 2022 09:32:43 +0900
Subject: [PATCH] Remove deprecated designate::producer::backend_url

... because it was deprecated during Xena cycle[1] in favor of the new
designate::coordination class.

[1] 823d409fe8ef56bb5be931791c5624bd70df0e26
Change-Id: I564ef6ec944c4b0f4a48fe99db2aade54e7f684c
---
 manifests/coordination.pp                           |  4 +---
 manifests/producer.pp                               | 13 -------------
 .../cleanup-coordination-7707a8558645c34d.yaml      |  4 ++++
 spec/classes/designate_producer_spec.rb             |  8 +++-----
 4 files changed, 8 insertions(+), 21 deletions(-)
 create mode 100644 releasenotes/notes/cleanup-coordination-7707a8558645c34d.yaml

diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index efdb1f50..61556305 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -26,10 +26,8 @@ class designate::coordination (
 
   include designate::deps
 
-  $backend_url_real = pick($::designate::producer::backend_url, $backend_url)
-
   oslo::coordination{ 'designate_config':
-    backend_url => $backend_url_real
+    backend_url => $backend_url
   }
 
   designate_config {
diff --git a/manifests/producer.pp b/manifests/producer.pp
index 00ee7051..22476a1c 100644
--- a/manifests/producer.pp
+++ b/manifests/producer.pp
@@ -32,12 +32,6 @@
 #  (optional) List of tasks to enable, the default enables all tasks.
 #  Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*backend_url*]
-#  (optional) URL to use for coordination, should be a tooz URL.
-#  Defaults to undef
-#
 class designate::producer (
   $package_ensure = 'present',
   $package_name   = $::designate::params::producer_package_name,
@@ -46,8 +40,6 @@ class designate::producer (
   $workers        = $::os_workers,
   $threads        = $::os_service_default,
   $enabled_tasks  = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $backend_url    = undef,
 ) inherits designate::params {
 
   designate_config {
@@ -56,11 +48,6 @@ class designate::producer (
     'service:producer/enabled_tasks' : value => join(any2array($enabled_tasks), ',');
   }
 
-  if $backend_url != undef {
-    warning('designate::producer::backend_url is deprecated. Use designate::coordination instead')
-    include designate::coordination
-  }
-
   designate::generic_service { 'producer':
     package_ensure => $package_ensure,
     enabled        => $enabled,
diff --git a/releasenotes/notes/cleanup-coordination-7707a8558645c34d.yaml b/releasenotes/notes/cleanup-coordination-7707a8558645c34d.yaml
new file mode 100644
index 00000000..0658d031
--- /dev/null
+++ b/releasenotes/notes/cleanup-coordination-7707a8558645c34d.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``designate::producer::backend_url`` parameter has been removed.
diff --git a/spec/classes/designate_producer_spec.rb b/spec/classes/designate_producer_spec.rb
index 7e081a62..9f9cbf89 100644
--- a/spec/classes/designate_producer_spec.rb
+++ b/spec/classes/designate_producer_spec.rb
@@ -11,10 +11,9 @@ describe 'designate::producer' do
   end
   let :designate_producer_params do
     {
-      :workers            => '3',
-      :threads            => '3000',
-      :enabled_tasks      => ['domain_purge','periodic_secondary_refresh'],
-      :backend_url        => 'redis://10.0.0.1:1234'
+      :workers       => '3',
+      :threads       => '3000',
+      :enabled_tasks => ['domain_purge','periodic_secondary_refresh'],
     }
   end
 
@@ -47,7 +46,6 @@ describe 'designate::producer' do
         is_expected.to contain_designate_config("service:producer/workers").with_value('3')
         is_expected.to contain_designate_config("service:producer/threads").with_value('3000')
         is_expected.to contain_designate_config("service:producer/enabled_tasks").with_value('domain_purge,periodic_secondary_refresh')
-        is_expected.to contain_designate_config("coordination/backend_url").with_value('redis://10.0.0.1:1234')
       end
     end
   end