openstack/puppet-openstack-cookiecutter
Code Issues Proposed changes

Remove database_min_pool_size option

Browse Source 
min_pool_size option is not used，see:
https://review.opendev.org/#/c/565090/

Change-Id: Idac3a4f45ef909e07fbc9b6355c6f2bcb11fb548
Closes-Bug: #1868511
This commit is contained in:
ZhongShengping 2020-03-25 14:51:48 +08:00
parent 6032f058a2
commit c036b072cc
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet-{{cookiecutter.project_name}}/manifests/db.pp
View File

@ -26,10 +26,6 @@
# (Optional) Interval between retries of opening a database connection. # (Optional) Interval between retries of opening a database connection.
# Defaults to $::os_service_default # 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*] # [*database_max_pool_size*]
# (Optional)Maximum number of SQL connections to keep open in a pool. # (Optional)Maximum number of SQL connections to keep open in a pool.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -45,7 +41,6 @@
class {{cookiecutter.project_name}}::db ( class {{cookiecutter.project_name}}::db (
$database_connection = 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite', $database_connection = 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite',
$database_connection_recycle_time = $::os_service_default, $database_connection_recycle_time = $::os_service_default,
$database_min_pool_size = $::os_service_default,
$database_max_pool_size = $::os_service_default, $database_max_pool_size = $::os_service_default,
$database_db_max_retries = $::os_service_default, $database_db_max_retries = $::os_service_default,
$database_max_retries = $::os_service_default, $database_max_retries = $::os_service_default,
@ -62,7 +57,6 @@ class {{cookiecutter.project_name}}::db (
oslo::db { '{{cookiecutter.project_name}}_config': oslo::db { '{{cookiecutter.project_name}}_config':
connection => $database_connection, connection => $database_connection,
connection_recycle_time => $database_connection_recycle_time, connection_recycle_time => $database_connection_recycle_time,
min_pool_size => $database_min_pool_size,
db_max_retries => $database_db_max_retries, db_max_retries => $database_db_max_retries,
max_retries => $database_max_retries, max_retries => $database_max_retries,
retry_interval => $database_retry_interval, retry_interval => $database_retry_interval,

3
puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb
View File

@ -8,7 +8,6 @@ describe '{{cookiecutter.project_name}}::db' do
it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with( it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with(
:connection => 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite', :connection => 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite',
:connection_recycle_time => '<SERVICE DEFAULT>', :connection_recycle_time => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:db_max_retries => '<SERVICE DEFAULT>', :db_max_retries => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>', :max_pool_size => '<SERVICE DEFAULT>',
:max_retries => '<SERVICE DEFAULT>', :max_retries => '<SERVICE DEFAULT>',
@ -23,7 +22,6 @@ describe '{{cookiecutter.project_name}}::db' do
{ {
:database_connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}', :database_connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}',
:database_connection_recycle_time => '3601', :database_connection_recycle_time => '3601',
:database_min_pool_size => '2',
:database_db_max_retries => '-1', :database_db_max_retries => '-1',
:database_max_retries => '11', :database_max_retries => '11',
:database_retry_interval => '11', :database_retry_interval => '11',
@ -38,7 +36,6 @@ describe '{{cookiecutter.project_name}}::db' do
it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with( it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with(
:connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}', :connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}',
:connection_recycle_time => '3601', :connection_recycle_time => '3601',
:min_pool_size => '2',
:db_max_retries => '-1', :db_max_retries => '-1',
:max_pool_size => '11', :max_pool_size => '11',
:max_retries => '11', :max_retries => '11',