Remove deprecated database options

... because these options were deprecated during Yoga cycle[1].

[1] a1f85ce1ef33f2d1f8c9bfe89e84d4f8a32248c0

Depends-on: https://review.opendev.org/842828
Change-Id: I6e7402bacd8ca23abda39d9fb3330cface5da288

manifests/db.pp

@@ -51,22 +51,13 @@ class trove::db (
 
   include trove::deps
 
-  # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
-  # to use trove::<myparam> if trove::db::<myparam> isn't specified.
-  $database_connection_real              = pick($::trove::database_connection, $database_connection)
-  $database_connection_recycle_time_real = pick($::trove::database_idle_timeout, $database_connection_recycle_time)
-  $database_max_pool_size_real           = pick($::trove::database_max_pool_size, $database_max_pool_size)
-  $database_max_retries_real             = pick($::trove::database_max_retries, $database_max_retries)
-  $database_retry_interval_real          = pick($::trove::database_retry_interval, $database_retry_interval)
-  $database_max_overflow_real            = pick($::trove::database_max_overflow, $database_max_overflow)
-
   oslo::db { 'trove_config':
-    connection              => $database_connection_real,
-    connection_recycle_time => $database_connection_recycle_time_real,
-    max_pool_size           => $database_max_pool_size_real,
-    max_retries             => $database_max_retries_real,
-    retry_interval          => $database_retry_interval_real,
-    max_overflow            => $database_max_overflow_real,
+    connection              => $database_connection,
+    connection_recycle_time => $database_connection_recycle_time,
+    max_pool_size           => $database_max_pool_size,
+    max_retries             => $database_max_retries,
+    retry_interval          => $database_retry_interval,
+    max_overflow            => $database_max_overflow,
     pool_timeout            => $database_pool_timeout,
     mysql_enable_ndb        => $mysql_enable_ndb,
   }

manifests/init.pp

@@ -239,33 +239,6 @@
 #   (optional) The state of the package.
 #   Defaults to 'present'
 #
-# DEPRECATED PARAMETERS
-#
-# [*database_connection*]
-#   (optional) Connection url to connect to trove database.
-#   Defaults to undef.
-#
-# [*database_idle_timeout*]
-#   (optional) Timeout before idle db connections are reaped.
-#   Defaults to undef.
-#
-# [*database_max_retries*]
-#   (optional) Maximum number of database connection retries during startup.
-#   Setting -1 implies an infinite retry count.
-#   Defaults to undef.
-#
-# [*database_retry_interval*]
-#   (optional) Interval between retries of opening a database connection.
-#   Defaults to undef.
-#
-# [*database_max_pool_size*]
-#   (optional) Maximum number of SQL connections to keep open in a pool.
-#   Defaults to: undef.
-#
-# [*database_max_overflow*]
-#   (optional) If set, use this value for max_overflow with sqlalchemy.
-#   Defaults to: undef.
-#
 class trove(
   $default_transport_url        = $::os_service_default,
   $notification_transport_url   = $::os_service_default,
@@ -317,32 +290,12 @@ class trove(
   $neutron_endpoint_type        = $::os_service_default,
   $default_neutron_networks     = $::os_service_default,
   $package_ensure               = 'present',
-  # DEPRECATED PARAMETERS
-  $database_connection          = undef,
-  $database_idle_timeout        = undef,
-  $database_max_retries         = undef,
-  $database_retry_interval      = undef,
-  $database_max_pool_size       = undef,
-  $database_max_overflow        = undef,
 ) {
 
   include trove::deps
   include trove::policy
   include trove::params
 
-  [
-    'database_connection',
-    'database_idle_timeout',
-    'database_max_retries',
-    'database_retry_interval',
-    'database_max_pool_size',
-    'database_max_overflow'
-  ].each |String $db_opt| {
-    if getvar($db_opt) != undef {
-      warning("The ${db_opt} parameter is deprecated. Use the parameters of trove::db.")
-    }
-  }
-
   if $nova_compute_url {
     trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url }
   }

releasenotes/notes/remove-database-options-9f865faa07dee7af.yaml

@@ -0,0 +1,12 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``trove`` class have been removed.
+    Use parameters of the ``trove::db`` class instead.
+
+    - ``database_connection``
+    - ``database_idle_timeout``
+    - ``database_max_retries``
+    - ``database_retry_interval``
+    - ``database_max_pool_size``
+    - ``database_max_overflow``