openstack
/
puppet-designate
Code Issues Proposed changes

Merge "bind9 backend: Clean up deprecated rndc_host"

This commit is contained in:
Zuul 2022-06-21 00:58:52 +00:00 committed by Gerrit Code Review
parent 3fbb968847 09eaea3132
commit c3744a4b3e
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/backend/bind9.pp
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,

4
releasenotes/notes/bind9-backend-cleanup-d7d6656c0f867ef3.yaml Normal file
View File

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