From a82d3e4572b5744fdfbefc68e02e268286edc3d9 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 25 Mar 2020 14:53:40 +0800
Subject: [PATCH] Deprecate min_pool_size option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

min_pool_size option is not used，see:

https://review.opendev.org/#/c/565090/

Change-Id: I89aaa943c7af18298fce74e38a60639b8bd15068
Closes-Bug: #1868511
---
 manifests/db.pp                               | 20 ++++++++++++-------
 ...min_pool_size-option-aecf5b2daa3c2d51.yaml |  4 ++++
 spec/classes/barbican_db_spec.rb              |  3 ---
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/deprecate_database_min_pool_size-option-aecf5b2daa3c2d51.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index a8a24ff1..314d006b 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -23,11 +23,6 @@
 #   NOTE: This is currently NOT used until barbican correctly leverages oslo.
 #   (Optional) Defaults to $::os_service_default
 #
-# [*database_min_pool_size*]
-#   Minimum number of SQL connections to keep open in a pool.
-#   NOTE: This is currently NOT used until barbican correctly leverages oslo.
-#   (Optional) Defaults to $::os_service_default
-#
 # [*database_max_pool_size*]
 #   Maximum number of SQL connections to keep open in a pool.
 #   NOTE: This is currently NOT used until barbican correctly leverages oslo.
@@ -52,10 +47,16 @@
 #   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
 #   Defaults to $::os_service_default
 #
+# DEPRECATED PARAMETERS
+#
+# [*database_min_pool_size*]
+#   Minimum number of SQL connections to keep open in a pool.
+#   NOTE: This is currently NOT used until barbican correctly leverages oslo.
+#   (Optional) Defaults to undef
+#
 class barbican::db (
   $database_connection              = 'sqlite:////var/lib/barbican/barbican.sqlite',
   $database_connection_recycle_time = $::os_service_default,
-  $database_min_pool_size           = $::os_service_default,
   $database_max_pool_size           = $::os_service_default,
   $database_max_retries             = $::os_service_default,
   $database_retry_interval          = $::os_service_default,
@@ -63,17 +64,22 @@ class barbican::db (
   $database_pool_size               = $::os_service_default,
   $database_db_max_retries          = $::os_service_default,
   $database_pool_timeout            = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $database_min_pool_size           = undef,
 ) {
 
   include barbican::deps
 
+  if $database_min_pool_size {
+    warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
+  }
+
   validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
     ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
 
   oslo::db { 'barbican_config':
     connection              => $database_connection,
     connection_recycle_time => $database_connection_recycle_time,
-    min_pool_size           => $database_min_pool_size,
     max_pool_size           => $database_max_pool_size,
     max_retries             => $database_max_retries,
     retry_interval          => $database_retry_interval,
diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-aecf5b2daa3c2d51.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-aecf5b2daa3c2d51.yaml
new file mode 100644
index 00000000..03e58c2b
--- /dev/null
+++ b/releasenotes/notes/deprecate_database_min_pool_size-option-aecf5b2daa3c2d51.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - database_min_pool_size option is now deprecated for removal, the
+    parameter has no effect.
diff --git a/spec/classes/barbican_db_spec.rb b/spec/classes/barbican_db_spec.rb
index c49b8f71..039c232e 100644
--- a/spec/classes/barbican_db_spec.rb
+++ b/spec/classes/barbican_db_spec.rb
@@ -28,7 +28,6 @@ describe 'barbican::db' do
         :db_max_retries          => '<SERVICE DEFAULT>',
         :connection              => 'sqlite:////var/lib/barbican/barbican.sqlite',
         :connection_recycle_time => '<SERVICE DEFAULT>',
-        :min_pool_size           => '<SERVICE DEFAULT>',
         :max_pool_size           => '<SERVICE DEFAULT>',
         :max_retries             => '<SERVICE DEFAULT>',
         :retry_interval          => '<SERVICE DEFAULT>',
@@ -48,7 +47,6 @@ describe 'barbican::db' do
         {
           :database_connection              => 'mysql+pymysql://barbican:barbican@localhost/barbican',
           :database_connection_recycle_time => '3601',
-          :database_min_pool_size           => '2',
           :database_max_pool_size           => '11',
           :database_max_retries             => '11',
           :database_retry_interval          => '11',
@@ -65,7 +63,6 @@ describe 'barbican::db' do
         :db_max_retries          => '-1',
         :connection              => 'mysql+pymysql://barbican:barbican@localhost/barbican',
         :connection_recycle_time => '3601',
-        :min_pool_size           => '2',
         :max_pool_size           => '11',
         :max_retries             => '11',
         :retry_interval          => '11',