openstack
/
puppet-designate
Code Issues Proposed changes

Merge "bind9 backend: Manage pool by default"

This commit is contained in:
Zuul 2022-06-20 19:41:24 +00:00 committed by Gerrit Code Review
parent d425d2ed73 35d366034a
commit 3fbb968847
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/backend/bind9.pp
View File

@ -52,7 +52,7 @@
#
# [*manage_pool*]
# (Optional) Manage pools.yaml and update pools by designate-manage command
# Defaults to false
# Defaults to true
#
# DEPRECATED PARAMETERS
#
@ -72,7 +72,7 @@ class designate::backend::bind9 (
$mdns_hosts = ['127.0.0.1'],
$mdns_port = 5354,
$configure_bind = true,
$manage_pool = undef,
$manage_pool = true,
# DEPRECATED PARAMETERS
$rndc_host = undef,
) {
@ -128,13 +128,7 @@ class designate::backend::bind9 (
'backend:bind9/rndc_key_file' : ensure => absent;
}
# TODO(tkajinam): Update default after Yoga release.
if $manage_pool == undef {
warning('Pool management will be enabled by default in a future release, \
Make sure manage_pool is set to disable the feature')
}
if pick($manage_pool, false) {
if $manage_pool {
file { '/etc/designate/pools.yaml':
ensure => present,
path => '/etc/designate/pools.yaml',

6
releasenotes/notes/manage-pool-by-default-9e911ece8309b491.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Defualt value of the ``designate::backend::bind9::manage_pool`` parameter
has been updated from ``false`` to ``true`` and the class now configures
the pool by default.

3
spec/classes/designate_backend_bind9_spec.rb
View File

@ -7,9 +7,8 @@ describe 'designate::backend::bind9' do
shared_examples 'designate-backend-bind9' do
context 'with default params' do
# TODO(tkajinam): remove this once we update the default value
let :params do
{ :manage_pool => true }
{}
end
it 'configures named and pool' do
is_expected.to contain_concat_fragment('dns allow-new-zones').with(