worker: Remove deprecated worker_topic

The parameter was deprecated during the past cycle[1] in favor of
the new worker parameter.

[1] b3f2658886

Change-Id: I02673fe8ec9749c98f2381ab6b2bbe0c1093b576
This commit is contained in:
Takashi Kajinami 2022-11-15 11:33:45 +09:00
parent 8522fa13a8
commit 6aeb861a3d
2 changed files with 5 additions and 18 deletions

View File

@ -56,12 +56,6 @@
# (optional) RPC topic for worker component.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*worker_topic*]
# (optional) RPC topic for worker component.
# Defaults to undef
#
class designate::worker(
$package_ensure = present,
$worker_package_name = $::designate::params::worker_package_name,
@ -76,16 +70,10 @@ class designate::worker(
$poll_delay = $::os_service_default,
$export_synchronous = $::os_service_default,
$topic = $::os_service_default,
# DEPRECATED PARAMETERS
$worker_topic = undef,
) inherits designate::params {
include designate::deps
if $worker_topic != undef {
warning('The worker_topic parameter is deprecated. Use the topic parameter instead.')
}
designate::generic_service { 'worker':
package_ensure => $package_ensure,
enabled => $enabled,
@ -103,11 +91,6 @@ class designate::worker(
'service:worker/poll_max_retries': value => $poll_max_retries;
'service:worker/poll_delay': value => $poll_delay;
'service:worker/export_synchronous': value => $export_synchronous;
'service:worker/topic': value => pick($worker_topic, $topic);
}
# TODO(tkajinam): Remove this after Zed release
designate_config {
'service:worker/worker_topic': ensure => absent;
'service:worker/topic': value => $topic;
}
}

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``designate::worker::worker_topic`` parameter has been removed.