openstack
/
puppet-designate
Code Issues Proposed changes

mdns: Deprecate support for storage_driver 

Support for different storage driver has been deprecated in 2023.2
cucle[1], and the options have been removed[2].

[1] 0c30fc491b0012da13a562c9107f4451790607dd
[2] ef4640347ab31b6c0e096dfc22bcf078326339d0

Change-Id: Ib238a463fc3c04dcbb464de0521f3fe700c6bf14
This commit is contained in:
Takashi Kajinami 2023-11-15 02:21:48 +09:00
parent b1f3bf273e
commit 5190a311fb
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/mdns.pp
View File

@ -40,10 +40,6 @@
# (Optional) Enforce all incoming queries (including AXFR) are TSIG signed.
# Defaults to $facts['os_service_default'].
#
# [*storage_driver*]
# (Optional) The storage driver to use.
# Defaults to $facts['os_service_default'].
#
# [*max_message_size*]
# (Optional) Maximum message size to emit.
# Defaults to $facts['os_service_default'].
@ -66,6 +62,10 @@
# (Optional) Timeout in seconds for XFR's.
# Defaults to undef.
#
# [*storage_driver*]
# (Optional) The storage driver to use.
# Defaults to undef.
#
class designate::mdns (
$package_ensure = present,
$mdns_package_name = $::designate::params::mdns_package_name,
@ -76,13 +76,13 @@ class designate::mdns (
$tcp_backlog = $facts['os_service_default'],
$tcp_recv_timeout = $facts['os_service_default'],
$query_enforce_tsig = $facts['os_service_default'],
$storage_driver = $facts['os_service_default'],
$max_message_size = $facts['os_service_default'],
$listen = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$topic = undef,
$all_tcp = undef,
$xfr_timeout = undef,
$storage_driver = undef,
) inherits designate::params {
include designate::deps
@ -99,22 +99,26 @@ Use the designate::worker::${opt} parameter instead.")
}
}
if $storage_driver {
warning('The storage driver parameter is deprecated and has no effect')
}
designate_config {
'service:mdns/workers' : value => $workers;
'service:mdns/threads' : value => $threads;
'service:mdns/tcp_backlog' : value => $tcp_backlog;
'service:mdns/tcp_recv_timeout' : value => $tcp_recv_timeout;
'service:mdns/query_enforce_tsig' : value => $query_enforce_tsig;
'service:mdns/storage_driver' : value => $storage_driver;
'service:mdns/max_message_size' : value => $max_message_size;
'service:mdns/listen' : value => join(any2array($listen), ',');
}
# TODO(tkajinam): Remove this after 2024.1 release.
designate_config {
'service:mdns/all_tcp' : ensure => absent;
'service:mdns/topic' : ensure => absent;
'service:mdns/xfr_timeout' : ensure => absent;
'service:mdns/all_tcp' : ensure => absent;
'service:mdns/topic' : ensure => absent;
'service:mdns/xfr_timeout' : ensure => absent;
'service:mdns/storage_driver': ensure => absent;
}
designate::generic_service { 'mdns':

5
releasenotes/notes/deprecate-storage_driver-6757fd4eaf1913ab.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``designate::mdns::storage_driver`` parameter has been deprecated and
has no effect.

3
spec/classes/designate_mdns_spec.rb
View File

@ -37,7 +37,6 @@ describe 'designate::mdns' do
is_expected.to contain_designate_config('service:mdns/tcp_backlog').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/tcp_recv_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/query_enforce_tsig').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/storage_driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/max_message_size').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('service:mdns/listen').with_value('<SERVICE DEFAULT>')
end
@ -50,7 +49,6 @@ describe 'designate::mdns' do
:tcp_backlog => 100,
:tcp_recv_timeout => 0.5,
:query_enforce_tsig => true,
:storage_driver => 'sqlalchemy',
:max_message_size => 65535,
:listen => ['192.0.2.10:5354', '192.0.2.20:5354'],
})
@ -61,7 +59,6 @@ describe 'designate::mdns' do
is_expected.to contain_designate_config('service:mdns/tcp_backlog').with_value(100)
is_expected.to contain_designate_config('service:mdns/tcp_recv_timeout').with_value(0.5)
is_expected.to contain_designate_config('service:mdns/query_enforce_tsig').with_value(true)
is_expected.to contain_designate_config('service:mdns/storage_driver').with_value('sqlalchemy')
is_expected.to contain_designate_config('service:mdns/max_message_size').with_value(65535)
is_expected.to contain_designate_config('service:mdns/listen').with_value('192.0.2.10:5354,192.0.2.20:5354')
end