diff --git a/manifests/db.pp b/manifests/db.pp index f1fa760..0f8e92d 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,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*] +# (optional) Minimum number of SQL connections to keep open in a pool. +# Defaults to undef. +# class vitrage::db ( $database_connection = 'mysql+pymysql://vitrage:secrete@localhost:3306/vitrage', $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 vitrage::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 { 'vitrage_config': connection => $database_connection, connection_recycle_time => $database_connection_recycle_time, - min_pool_size => $database_min_pool_size, max_pool_size => $database_max_pool_size, db_max_retries => $database_db_max_retries, max_retries => $database_max_retries, diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-8385ce419bcb2ca3.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-8385ce419bcb2ca3.yaml new file mode 100644 index 0000000..03e58c2 --- /dev/null +++ b/releasenotes/notes/deprecate_database_min_pool_size-option-8385ce419bcb2ca3.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/vitrage_db_spec.rb b/spec/classes/vitrage_db_spec.rb index 476cadc..e8c4d11 100644 --- a/spec/classes/vitrage_db_spec.rb +++ b/spec/classes/vitrage_db_spec.rb @@ -9,7 +9,6 @@ describe 'vitrage::db' do :db_max_retries => '', :connection => 'mysql+pymysql://vitrage:secrete@localhost:3306/vitrage', :connection_recycle_time => '', - :min_pool_size => '', :max_pool_size => '', :max_retries => '', :retry_interval => '', @@ -23,7 +22,6 @@ describe 'vitrage::db' do { :database_connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage', :database_connection_recycle_time => '3601', - :database_min_pool_size => '2', :database_db_max_retries => '-1', :database_max_retries => '11', :database_retry_interval => '11', @@ -39,7 +37,6 @@ describe 'vitrage::db' do :db_max_retries => '-1', :connection => 'mysql+pymysql://vitrage:vitrage@localhost/vitrage', :connection_recycle_time => '3601', - :min_pool_size => '2', :max_pool_size => '11', :max_retries => '11', :retry_interval => '11',