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.
|
# designate and designate bind services are collocated.
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
#
|
#
|
||||||
# [*manage_pool*]
|
|
||||||
# (Optional) Manage pools.yaml and update pools by designate-manage command
|
|
||||||
# Defaults to true
|
|
||||||
#
|
|
||||||
class designate::backend::bind9 (
|
class designate::backend::bind9 (
|
||||||
$rndc_config_file = '/etc/rndc.conf',
|
$rndc_config_file = '/etc/rndc.conf',
|
||||||
$rndc_key_file = '/etc/rndc.key',
|
$rndc_key_file = '/etc/rndc.key',
|
||||||
@ -85,7 +81,6 @@ class designate::backend::bind9 (
|
|||||||
Hash[String[1], String[1]] $attributes = {},
|
Hash[String[1], String[1]] $attributes = {},
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
Boolean $configure_bind = true,
|
Boolean $configure_bind = true,
|
||||||
Boolean $manage_pool = true,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
@ -115,27 +110,23 @@ and will be removed in a future release.")
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if $manage_pool {
|
file { '/etc/designate/pools.yaml':
|
||||||
file { '/etc/designate/pools.yaml':
|
ensure => present,
|
||||||
ensure => present,
|
path => '/etc/designate/pools.yaml',
|
||||||
path => '/etc/designate/pools.yaml',
|
owner => $designate::params::user,
|
||||||
owner => $designate::params::user,
|
group => $designate::params::group,
|
||||||
group => $designate::params::group,
|
mode => '0640',
|
||||||
mode => '0640',
|
content => template('designate/bind9-pools.yaml.erb'),
|
||||||
content => template('designate/bind9-pools.yaml.erb'),
|
require => Anchor['designate::config::begin'],
|
||||||
require => Anchor['designate::config::begin'],
|
before => Anchor['designate::config::end'],
|
||||||
before => Anchor['designate::config::end'],
|
}
|
||||||
}
|
|
||||||
|
|
||||||
exec { 'designate-manage pool update':
|
exec { 'designate-manage pool update':
|
||||||
command => 'designate-manage pool update',
|
command => 'designate-manage pool update',
|
||||||
path => '/usr/bin',
|
path => '/usr/bin',
|
||||||
user => $designate::params::user,
|
user => $designate::params::user,
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
require => Anchor['designate::service::end'],
|
require => Anchor['designate::service::end'],
|
||||||
subscribe => File['/etc/designate/pools.yaml'],
|
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.
|
# (Optional) Pool attribtes used by scheduling.
|
||||||
# Defaults to {}
|
# Defaults to {}
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*manage_pool*]
|
|
||||||
# (Optional) Manage pools.yaml and update pools by designate-manage command
|
|
||||||
# Defaults to true
|
|
||||||
#
|
|
||||||
class designate::backend::pdns4 (
|
class designate::backend::pdns4 (
|
||||||
String[1] $api_token,
|
String[1] $api_token,
|
||||||
Array[String[1], 1] $pdns4_hosts = ['127.0.0.1'],
|
Array[String[1], 1] $pdns4_hosts = ['127.0.0.1'],
|
||||||
@ -57,35 +51,29 @@ class designate::backend::pdns4 (
|
|||||||
Optional[String[1]] $tsigkey_name = undef,
|
Optional[String[1]] $tsigkey_name = undef,
|
||||||
Array[String[1]] $also_notifies = [],
|
Array[String[1]] $also_notifies = [],
|
||||||
Hash[String[1], String[1]] $attributes = {},
|
Hash[String[1], String[1]] $attributes = {},
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
Boolean $manage_pool = true,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
if $manage_pool {
|
file { '/etc/designate/pools.yaml':
|
||||||
file { '/etc/designate/pools.yaml':
|
ensure => present,
|
||||||
ensure => present,
|
path => '/etc/designate/pools.yaml',
|
||||||
path => '/etc/designate/pools.yaml',
|
owner => $designate::params::user,
|
||||||
owner => $designate::params::user,
|
group => $designate::params::group,
|
||||||
group => $designate::params::group,
|
mode => '0640',
|
||||||
mode => '0640',
|
content => template('designate/pdns4-pools.yaml.erb'),
|
||||||
content => template('designate/pdns4-pools.yaml.erb'),
|
show_diff => false,
|
||||||
show_diff => false,
|
require => Anchor['designate::config::begin'],
|
||||||
require => Anchor['designate::config::begin'],
|
before => Anchor['designate::config::end'],
|
||||||
before => Anchor['designate::config::end'],
|
}
|
||||||
}
|
|
||||||
|
|
||||||
exec { 'designate-manage pool update':
|
exec { 'designate-manage pool update':
|
||||||
command => 'designate-manage pool update',
|
command => 'designate-manage pool update',
|
||||||
path => '/usr/bin',
|
path => '/usr/bin',
|
||||||
user => $designate::params::user,
|
user => $designate::params::user,
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
require => Anchor['designate::service::end'],
|
require => Anchor['designate::service::end'],
|
||||||
subscribe => File['/etc/designate/pools.yaml'],
|
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')
|
is_expected.to_not contain_class('dns')
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
|
@ -28,19 +28,6 @@ describe 'designate::backend::pdns4' do
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
|
Loading…
Reference in New Issue
Block a user