Remove deprecated manage_pool parameters
The parameters were deprecated in the 2024.1 release[1] so are ready
for removal.
[1] e19976ade6
Change-Id: I4e62059dced674c9a2d3384db36b32d164341dd4
This commit is contained in:
parent
5a4214fce2
commit
7e09ca63d7
|
@ -65,10 +65,6 @@
|
|||
# designate and designate bind services are collocated.
|
||||
# Defaults to true
|
||||
#
|
||||
# [*manage_pool*]
|
||||
# (Optional) Manage pools.yaml and update pools by designate-manage command
|
||||
# Defaults to true
|
||||
#
|
||||
class designate::backend::bind9 (
|
||||
$rndc_config_file = '/etc/rndc.conf',
|
||||
$rndc_key_file = '/etc/rndc.key',
|
||||
|
@ -85,7 +81,6 @@ class designate::backend::bind9 (
|
|||
Hash[String[1], String[1]] $attributes = {},
|
||||
# DEPRECATED PARAMETERS
|
||||
Boolean $configure_bind = true,
|
||||
Boolean $manage_pool = true,
|
||||
) {
|
||||
|
||||
include designate::deps
|
||||
|
@ -115,7 +110,6 @@ and will be removed in a future release.")
|
|||
}
|
||||
}
|
||||
|
||||
if $manage_pool {
|
||||
file { '/etc/designate/pools.yaml':
|
||||
ensure => present,
|
||||
path => '/etc/designate/pools.yaml',
|
||||
|
@ -135,7 +129,4 @@ and will be removed in a future release.")
|
|||
require => Anchor['designate::service::end'],
|
||||
subscribe => File['/etc/designate/pools.yaml'],
|
||||
}
|
||||
} else {
|
||||
warning('The manage_pool parameter is deprecated and will be removed in a future release')
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,12 +41,6 @@
|
|||
# (Optional) Pool attribtes used by scheduling.
|
||||
# Defaults to {}
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*manage_pool*]
|
||||
# (Optional) Manage pools.yaml and update pools by designate-manage command
|
||||
# Defaults to true
|
||||
#
|
||||
class designate::backend::pdns4 (
|
||||
String[1] $api_token,
|
||||
Array[String[1], 1] $pdns4_hosts = ['127.0.0.1'],
|
||||
|
@ -57,14 +51,11 @@ class designate::backend::pdns4 (
|
|||
Optional[String[1]] $tsigkey_name = undef,
|
||||
Array[String[1]] $also_notifies = [],
|
||||
Hash[String[1], String[1]] $attributes = {},
|
||||
# DEPRECATED PARAMETERS
|
||||
Boolean $manage_pool = true,
|
||||
) {
|
||||
|
||||
include designate::deps
|
||||
include designate::params
|
||||
|
||||
if $manage_pool {
|
||||
file { '/etc/designate/pools.yaml':
|
||||
ensure => present,
|
||||
path => '/etc/designate/pools.yaml',
|
||||
|
@ -85,7 +76,4 @@ class designate::backend::pdns4 (
|
|||
require => Anchor['designate::service::end'],
|
||||
subscribe => File['/etc/designate/pools.yaml'],
|
||||
}
|
||||
} else {
|
||||
warning('The manage_pool parameter is deprecated and will be removed in a future release')
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The following deprecated parameters have been removed.
|
||||
|
||||
- ``designate::backend::bind9::manage_pool``
|
||||
- ``designate::backend::pdns4::manage_pool``
|
|
@ -41,17 +41,6 @@ describe 'designate::backend::bind9' do
|
|||
is_expected.to_not contain_class('dns')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with pool management disabled' do
|
||||
let :params do
|
||||
{ :manage_pool => false }
|
||||
end
|
||||
it 'does not configure pool' do
|
||||
is_expected.to_not contain_file('/etc/designate/pools.yaml')
|
||||
is_expected.to_not contain_exec('designate-manage pool update')
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
on_supported_os({
|
||||
|
|
|
@ -28,19 +28,6 @@ describe 'designate::backend::pdns4' do
|
|||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with pool management disabled' do
|
||||
before do
|
||||
params.merge!({
|
||||
:manage_pool => false
|
||||
})
|
||||
end
|
||||
it 'does not configure pool' do
|
||||
is_expected.to_not contain_file('/etc/designate/pools.yaml')
|
||||
is_expected.to_not contain_exec('designate-manage pool update')
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
on_supported_os({
|
||||
|
|
Loading…
Reference in New Issue