From 57f76bd65b2ddade16509d2bd6608197e8fd2445 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: I6f0591f44cfb1ad2f5eb3322c119cd0345b782f6
Closes-Bug: #1868511
---
 manifests/db.pp                                | 18 ++++++++++++------
 ..._min_pool_size-option-ab80270dd8a6e444.yaml |  4 ++++
 spec/classes/ec2api_db_spec.rb                 |  3 ---
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/deprecate_database_min_pool_size-option-ab80270dd8a6e444.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 4d329d7..aa1bcc2 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -26,10 +26,6 @@
 #   Interval between retries of opening a database connection.
 #   (Optional) Defaults to $::os_service_default
 #
-# [*database_min_pool_size*]
-#   Minimum number of SQL connections to keep open in a pool.
-#   (Optional) Defaults to $::os_service_default
-#
 # [*database_max_pool_size*]
 #   Maximum number of SQL connections to keep open in a pool.
 #   (Optional) Defaults to $::os_service_default
@@ -42,27 +38,37 @@
 #   (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.
+#   (Optional) Defaults to undef
+#
 class ec2api::db (
   $database_connection              = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
   $database_connection_recycle_time = $::os_service_default,
-  $database_min_pool_size           = $::os_service_default,
   $database_max_pool_size           = $::os_service_default,
   $database_db_max_retries          = $::os_service_default,
   $database_max_retries             = $::os_service_default,
   $database_retry_interval          = $::os_service_default,
   $database_max_overflow            = $::os_service_default,
   $database_pool_timeout            = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $database_min_pool_size           = undef,
 ) {
 
   include ec2api::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 { 'ec2api_config':
     connection              => $database_connection,
     connection_recycle_time => $database_connection_recycle_time,
-    min_pool_size           => $database_min_pool_size,
     db_max_retries          => $database_db_max_retries,
     max_retries             => $database_max_retries,
     retry_interval          => $database_retry_interval,
diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-ab80270dd8a6e444.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-ab80270dd8a6e444.yaml
new file mode 100644
index 0000000..03e58c2
--- /dev/null
+++ b/releasenotes/notes/deprecate_database_min_pool_size-option-ab80270dd8a6e444.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/ec2api_db_spec.rb b/spec/classes/ec2api_db_spec.rb
index 12b2ef0..cb05a08 100644
--- a/spec/classes/ec2api_db_spec.rb
+++ b/spec/classes/ec2api_db_spec.rb
@@ -8,7 +8,6 @@ describe 'ec2api::db' do
       it { should contain_oslo__db('ec2api_config').with(
         :connection              => 'sqlite:////var/lib/ec2api/ec2api.sqlite',
         :connection_recycle_time => '<SERVICE DEFAULT>',
-        :min_pool_size           => '<SERVICE DEFAULT>',
         :db_max_retries          => '<SERVICE DEFAULT>',
         :max_retries             => '<SERVICE DEFAULT>',
         :retry_interval          => '<SERVICE DEFAULT>',
@@ -23,7 +22,6 @@ describe 'ec2api::db' do
         {
           :database_connection              => 'sqlite:////path/to/my/db.sqlite',
           :database_connection_recycle_time => '1',
-          :database_min_pool_size           => '2',
           :database_db_max_retries          => '-1',
           :database_max_retries             => '3',
           :database_retry_interval          => '4',
@@ -38,7 +36,6 @@ describe 'ec2api::db' do
       it { should contain_oslo__db('ec2api_config').with(
         :connection              => 'sqlite:////path/to/my/db.sqlite',
         :connection_recycle_time => '1',
-        :min_pool_size           => '2',
         :db_max_retries          => '-1',
         :max_retries             => '3',
         :retry_interval          => '4',