openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Deprecate designate::worker::worker_notify"

This commit is contained in:
Zuul 2020-04-27 19:47:21 +00:00 committed by Gerrit Code Review
parent fc143c7eb0 3134f475ab
commit e186034b3b
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/worker.pp
View File

@ -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,8 +115,14 @@ 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;
}
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;
}
}
}

5
releasenotes/notes/deprecate-worker-notify-f93ccf263b03c974.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The designate::worker::worker_notify parameter has been deprecated because
its actual parameter in designate was alreday rdeprecated.

1
spec/classes/designate_worker_spec.rb
View File

@ -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>' )
end