From 35f5e5e5201c28ff4624994f44475ad269edfb0e Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 18 Aug 2020 09:23:56 +0200
Subject: [PATCH] Remove deprecated database_min_pool_size parameter

Change-Id: Ia1208fc902064ce5cf3dc769e72cade497142e68
---
 manifests/db.pp                                      | 12 ------------
 manifests/init.pp                                    |  5 -----
 ...ated-database-min-pool-size-85d9e856d15b6b15.yaml |  5 +++++
 3 files changed, 5 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-database-min-pool-size-85d9e856d15b6b15.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 554bea0ea..0890e6e78 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -38,12 +38,6 @@
 #   (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 keystone::db (
   $database_db_max_retries          = $::os_service_default,
   $database_connection              = 'sqlite:////var/lib/keystone/keystone.sqlite',
@@ -53,16 +47,10 @@ class keystone::db (
   $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 keystone::deps
 
-  if $::keystone::database_min_pool_size or $database_min_pool_size {
-    warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
-  }
-
   # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
   # to use keystone::<myparam> if keystone::db::<myparam> isn't specified.
   $database_connection_real = pick($::keystone::database_connection, $database_connection)
diff --git a/manifests/init.pp b/manifests/init.pp
index 7a9f10a01..e08c52a8f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -433,10 +433,6 @@
 #   (Optional) Driver to use for managing tokens.
 #   Defaults to undef
 #
-# [*database_min_pool_size*]
-#   (Optional) Minimum number of SQL connections to keep open in a pool.
-#   Defaults to: undef
-#
 # == Authors
 #
 #   Dan Bode dan@puppetlabs.com
@@ -526,7 +522,6 @@ class keystone(
   $admin_workers                        = undef,
   $public_workers                       = undef,
   $token_driver                         = undef,
-  $database_min_pool_size               = undef,
 ) inherits keystone::params {
 
   include keystone::deps
diff --git a/releasenotes/notes/remove-deprecated-database-min-pool-size-85d9e856d15b6b15.yaml b/releasenotes/notes/remove-deprecated-database-min-pool-size-85d9e856d15b6b15.yaml
new file mode 100644
index 000000000..f53ed8cbb
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-database-min-pool-size-85d9e856d15b6b15.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated parameter database_min_pool_size is removed in the keystone
+    init class and keystone::db class.