diff --git a/manifests/api.pp b/manifests/api.pp index b1e71d12..9ca8e6a5 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -252,39 +252,10 @@ # properties. # Defaults to undef # -# [*database_min_pool_size*] -# (optional) Minimum number of SQL connections to keep open in a pool. -# Defaults to undef. -# # [*os_region_name*] # (optional) Sets the keystone region to use. # Defaults to undef # -# [*database_connection*] -# (optional) Connection url to connect to glance 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. -# Set to -1 to specify 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. -# # [*keymgr_backend*] # (optional) Key Manager service class. # Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager @@ -375,14 +346,7 @@ class glance::api( $default_store = undef, $multi_store = false, $show_multiple_locations = undef, - $database_min_pool_size = undef, $os_region_name = undef, - $database_connection = undef, - $database_idle_timeout = undef, - $database_max_pool_size = undef, - $database_max_retries = undef, - $database_retry_interval = undef, - $database_max_overflow = undef, $keymgr_backend = undef, $keymgr_encryption_api_url = undef, $keymgr_encryption_auth_url = undef, @@ -400,37 +364,6 @@ class glance::api( glance::backend::multistore::cinder::cinder_os_region_name instead.') } - if $database_connection != undef { - warning('The database_connection parameter is deprecated and will be \ -removed in a future realse. Use glance::api::db::database_connection instead') - } - - if $database_idle_timeout != undef { - warning('The database_idle_timeout parameter is deprecated and will be \ -removed in a future realse. Use glance::api::db::database_connection_recycle_time \ -instead') - } - - if $database_max_pool_size != undef { - warning('The database_max_pool_size parameter is deprecated and will be \ -removed in a future realse. Use glance::api::db::database_max_pool_size instead') - } - - if $database_max_retries!= undef { - warning('The database_max_retries parameter is deprecated and will be \ -removed in a future realse. Use glance::api::db::database_max_retries instead') - } - - if $database_retry_interval != undef { - warning('The database_retry_interval parameter is deprecated and will be \ -removed in a future realse. Use glance::api::db::database_retry_interval instead') - } - - if $database_max_overflow != undef { - warning('The database_max_overflow parameter is deprecated and will be \ -removed in a future realse. Use glance::api::db::database_max_overflow instead') - } - if $validate != undef { warning('The glance::api::validate parameter has been deprecated and has no effect') } diff --git a/manifests/api/db.pp b/manifests/api/db.pp index 73fcb460..978b75ed 100644 --- a/manifests/api/db.pp +++ b/manifests/api/db.pp @@ -43,12 +43,6 @@ # Cluster (NDB). # 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 glance::api::db ( $database_db_max_retries = $::os_service_default, $database_connection = 'sqlite:///var/lib/glance/glance.sqlite', @@ -59,34 +53,18 @@ class glance::api::db ( $database_max_overflow = $::os_service_default, $database_pool_timeout = $::os_service_default, $mysql_enable_ndb = $::os_service_default, - # DEPRECATED PARAMETERS - $database_min_pool_size = undef, ) { include glance::deps - if $::glance::api::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(degorenko): In order to keep backward compatibility we rely on the pick function - # to use glance::api:: if glance::api::db:: isn't specified. - $database_connection_real = pick($::glance::api::database_connection, $database_connection) - $database_connection_recycle_time_real = pick($::glance::api::database_idle_timeout, - $database_connection_recycle_time) - $database_max_pool_size_real = pick($::glance::api::database_max_pool_size, $database_max_pool_size) - $database_max_retries_real = pick($::glance::api::database_max_retries, $database_max_retries) - $database_retry_interval_real = pick($::glance::api::database_retry_interval, $database_retry_interval) - $database_max_overflow_real = pick($::glance::api::database_max_overflow, $database_max_overflow) - oslo::db { 'glance_api_config': db_max_retries => $database_db_max_retries, - connection => $database_connection_real, - connection_recycle_time => $database_connection_recycle_time_real, - max_retries => $database_max_retries_real, - retry_interval => $database_retry_interval_real, - max_pool_size => $database_max_pool_size_real, - max_overflow => $database_max_overflow_real, + connection => $database_connection, + connection_recycle_time => $database_connection_recycle_time, + max_retries => $database_max_retries, + retry_interval => $database_retry_interval, + max_pool_size => $database_max_pool_size, + max_overflow => $database_max_overflow, pool_timeout => $database_pool_timeout, mysql_enable_ndb => $mysql_enable_ndb, } diff --git a/releasenotes/notes/remove-database-params-2242c2c179b2da12.yaml b/releasenotes/notes/remove-database-params-2242c2c179b2da12.yaml new file mode 100644 index 00000000..39c3c816 --- /dev/null +++ b/releasenotes/notes/remove-database-params-2242c2c179b2da12.yaml @@ -0,0 +1,16 @@ +--- +upgrade: + - | + The following parameters of the ``glance::api`` class have been removed. + + - ``database_min_pool_size`` + - ``database_connection`` + - ``database_idle_timeout`` + - ``database_max_overflow`` + - ``database_max_pool_size`` + - ``database_max_retries`` + - ``database_retry_interval`` + + - | + The ``database_min_pool_size`` parameter of the ``glance::api::db`` class + has been removed.