bind9 backend: Clean up deprecated rndc_host

... and the logics to remove old parameters.

Depends-on: https://review.opendev.org/846491
Change-Id: Ib67b44cb289e75bfed022cec350fd2cd4bb6374b
This commit is contained in:
Takashi Kajinami
2022-06-19 21:59:08 +09:00
parent 35d366034a
commit 09eaea3132
2 changed files with 4 additions and 21 deletions

View File

@@ -54,12 +54,6 @@
# (Optional) Manage pools.yaml and update pools by designate-manage command
# Defaults to true
#
# DEPRECATED PARAMETERS
#
# [*rndc_host*]
# (Optional) RNDC Host
# Defaults to undef
#
class designate::backend::bind9 (
$rndc_config_file = '/etc/rndc.conf',
$rndc_key_file = '/etc/rndc.key',
@@ -73,8 +67,6 @@ class designate::backend::bind9 (
$mdns_port = 5354,
$configure_bind = true,
$manage_pool = true,
# DEPRECATED PARAMETERS
$rndc_host = undef,
) {
include designate::deps
@@ -115,19 +107,6 @@ class designate::backend::bind9 (
})
}
# TODO(tkajinam): Remove this after Yoga release.
if $rndc_host != undef {
warning('The rndc_host parameter is deprecated and has no effect.')
}
# TODO(tkajinam): Remove this after Yoga release.
designate_config {
'backend:bind9/rndc_host' : ensure => absent;
'backend:bind9/rndc_port' : ensure => absent;
'backend:bind9/rndc_config_file' : ensure => absent;
'backend:bind9/rndc_key_file' : ensure => absent;
}
if $manage_pool {
file { '/etc/designate/pools.yaml':
ensure => present,

View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``designate::backend::bind9::rndc_host`` parameter has been removed.