From 35d366034aa9c99ed08e32742700601e2c219950 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 19 Jun 2022 21:56:27 +0900
Subject: [PATCH] bind9 backend: Manage pool by default

This enables pool management step by default when configuring bind9
backend.

Change-Id: I8479c3a681cb8ccd9862dbf1d3b6f2e4600a292a
---
 manifests/backend/bind9.pp                           | 12 +++---------
 .../manage-pool-by-default-9e911ece8309b491.yaml     |  6 ++++++
 spec/classes/designate_backend_bind9_spec.rb         |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/manage-pool-by-default-9e911ece8309b491.yaml

diff --git a/manifests/backend/bind9.pp b/manifests/backend/bind9.pp
index 51e887b8..18110bd2 100644
--- a/manifests/backend/bind9.pp
+++ b/manifests/backend/bind9.pp
@@ -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',
diff --git a/releasenotes/notes/manage-pool-by-default-9e911ece8309b491.yaml b/releasenotes/notes/manage-pool-by-default-9e911ece8309b491.yaml
new file mode 100644
index 00000000..ca6b67f5
--- /dev/null
+++ b/releasenotes/notes/manage-pool-by-default-9e911ece8309b491.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.
diff --git a/spec/classes/designate_backend_bind9_spec.rb b/spec/classes/designate_backend_bind9_spec.rb
index 95b4512d..b7d9f4c1 100644
--- a/spec/classes/designate_backend_bind9_spec.rb
+++ b/spec/classes/designate_backend_bind9_spec.rb
@@ -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(