Merge "bind9 backend: Manage pool by default"
This commit is contained in:
commit
3fbb968847
@ -52,7 +52,7 @@
|
|||||||
#
|
#
|
||||||
# [*manage_pool*]
|
# [*manage_pool*]
|
||||||
# (Optional) Manage pools.yaml and update pools by designate-manage command
|
# (Optional) Manage pools.yaml and update pools by designate-manage command
|
||||||
# Defaults to false
|
# Defaults to true
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
@ -72,7 +72,7 @@ class designate::backend::bind9 (
|
|||||||
$mdns_hosts = ['127.0.0.1'],
|
$mdns_hosts = ['127.0.0.1'],
|
||||||
$mdns_port = 5354,
|
$mdns_port = 5354,
|
||||||
$configure_bind = true,
|
$configure_bind = true,
|
||||||
$manage_pool = undef,
|
$manage_pool = true,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$rndc_host = undef,
|
$rndc_host = undef,
|
||||||
) {
|
) {
|
||||||
@ -128,13 +128,7 @@ class designate::backend::bind9 (
|
|||||||
'backend:bind9/rndc_key_file' : ensure => absent;
|
'backend:bind9/rndc_key_file' : ensure => absent;
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO(tkajinam): Update default after Yoga release.
|
if $manage_pool {
|
||||||
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) {
|
|
||||||
file { '/etc/designate/pools.yaml':
|
file { '/etc/designate/pools.yaml':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
path => '/etc/designate/pools.yaml',
|
path => '/etc/designate/pools.yaml',
|
||||||
|
@ -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.
|
@ -7,9 +7,8 @@ describe 'designate::backend::bind9' do
|
|||||||
|
|
||||||
shared_examples 'designate-backend-bind9' do
|
shared_examples 'designate-backend-bind9' do
|
||||||
context 'with default params' do
|
context 'with default params' do
|
||||||
# TODO(tkajinam): remove this once we update the default value
|
|
||||||
let :params do
|
let :params do
|
||||||
{ :manage_pool => true }
|
{}
|
||||||
end
|
end
|
||||||
it 'configures named and pool' do
|
it 'configures named and pool' do
|
||||||
is_expected.to contain_concat_fragment('dns allow-new-zones').with(
|
is_expected.to contain_concat_fragment('dns allow-new-zones').with(
|
||||||
|
Loading…
Reference in New Issue
Block a user