diff --git a/manifests/db.pp b/manifests/db.pp index f104021c..b2cd0866 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -26,10 +26,6 @@ # (optional) Interval between retries of opening a database connection. # Defaults to $::os_service_default. # -# [*database_min_pool_size*] -# (optional) Minimum number of SQL connections to keep open in a pool. -# Defaults to $::os_service_default. -# # [*database_max_pool_size*] # (optional) Maximum number of SQL connections to keep open in a pool. # Defaults to $::os_service_default. @@ -42,25 +38,35 @@ # (Optional) If set, use this value for pool_timeout with SQLAlchemy. # Defaults to $::os_service_default # +# DEPRECATED PARAMETERS +# +# [*database_min_pool_size*] +# (optional) Minimum number of SQL connections to keep open in a pool. +# Defaults to undef. +# class sahara::db ( $database_db_max_retries = $::os_service_default, $database_connection = 'mysql+pymysql://sahara:secrete@localhost:3306/sahara', $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, $database_max_overflow = $::os_service_default, $database_pool_timeout = $::os_service_default, + # DEPRECATED PARAMETERS + $database_min_pool_size = undef, ) { include sahara::deps + if $::sahara::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 sahara:: if sahara::db:: isn't specified. $database_connection_real = pick($::sahara::database_connection, $database_connection) $database_connection_recycle_time_real = pick($::sahara::database_idle_timeout, $database_connection_recycle_time) - $database_min_pool_size_real = pick($::sahara::database_min_pool_size, $database_min_pool_size) $database_max_pool_size_real = pick($::sahara::database_max_pool_size, $database_max_pool_size) $database_max_retries_real = pick($::sahara::database_max_retries, $database_max_retries) $database_retry_interval_real = pick($::sahara::database_retry_interval, $database_retry_interval) @@ -73,7 +79,6 @@ class sahara::db ( db_max_retries => $database_db_max_retries, connection => $database_connection_real, connection_recycle_time => $database_connection_recycle_time_real, - min_pool_size => $database_min_pool_size_real, max_pool_size => $database_max_pool_size_real, max_retries => $database_max_retries_real, retry_interval => $database_retry_interval_real, diff --git a/manifests/init.pp b/manifests/init.pp index 93dace86..41f82950 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -60,10 +60,6 @@ # (optional) Interval between retries of opening a database connection. # Defaults to undef. # -# [*database_min_pool_size*] -# (optional) Minimum number of SQL connections to keep open in a pool. -# Defaults to undef. -# # [*database_max_pool_size*] # (optional) Maximum number of SQL connections to keep open in a pool. # Defaults to undef. @@ -260,6 +256,10 @@ # (Optional) TTL for zeromq messages. # Defaults to undef. # +# [*database_min_pool_size*] +# (optional) Minimum number of SQL connections to keep open in a pool. +# Defaults to undef. +# class sahara( $package_ensure = 'present', $host = $::os_service_default, @@ -272,7 +272,6 @@ class sahara( $key_file = $::os_service_default, $database_connection = undef, $database_idle_timeout = undef, - $database_min_pool_size = undef, $database_max_pool_size = undef, $database_max_retries = undef, $database_retry_interval = undef, @@ -320,6 +319,7 @@ class sahara( $zeromq_ipc_dir = undef, $zeromq_host = undef, $cast_timeout = undef, + $database_min_pool_size = undef, ) { include sahara::deps diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-bcd06862bec24736.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-bcd06862bec24736.yaml new file mode 100644 index 00000000..03e58c2b --- /dev/null +++ b/releasenotes/notes/deprecate_database_min_pool_size-option-bcd06862bec24736.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/sahara_db_spec.rb b/spec/classes/sahara_db_spec.rb index ef09d347..787c1b0b 100644 --- a/spec/classes/sahara_db_spec.rb +++ b/spec/classes/sahara_db_spec.rb @@ -9,7 +9,6 @@ describe 'sahara::db' do :db_max_retries => '', :connection => 'mysql+pymysql://sahara:secrete@localhost:3306/sahara', :connection_recycle_time => '', - :min_pool_size => '', :max_pool_size => '', :max_retries => '', :retry_interval => '', @@ -24,7 +23,6 @@ describe 'sahara::db' do :database_db_max_retries => '-1', :database_connection => 'mysql+pymysql://sahara:sahara@localhost/sahara', :database_connection_recycle_time => '3601', - :database_min_pool_size => '2', :database_max_retries => '11', :database_retry_interval => '11', :database_max_pool_size => '11', @@ -39,7 +37,6 @@ describe 'sahara::db' do :db_max_retries => '-1', :connection => 'mysql+pymysql://sahara:sahara@localhost/sahara', :connection_recycle_time => '3601', - :min_pool_size => '2', :max_pool_size => '11', :max_retries => '11', :retry_interval => '11',