diff --git a/puppet-{{cookiecutter.project_name}}/manifests/db.pp b/puppet-{{cookiecutter.project_name}}/manifests/db.pp index cda6b86..70748a2 100644 --- a/puppet-{{cookiecutter.project_name}}/manifests/db.pp +++ b/puppet-{{cookiecutter.project_name}}/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 @@ -45,7 +41,6 @@ class {{cookiecutter.project_name}}::db ( $database_connection = 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite', $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, @@ -62,7 +57,6 @@ class {{cookiecutter.project_name}}::db ( oslo::db { '{{cookiecutter.project_name}}_config': connection => $database_connection, connection_recycle_time => $database_connection_recycle_time, - min_pool_size => $database_min_pool_size, db_max_retries => $database_db_max_retries, max_retries => $database_max_retries, retry_interval => $database_retry_interval, diff --git a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb index 3393aca..9169c21 100644 --- a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb +++ b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_db_spec.rb @@ -8,7 +8,6 @@ describe '{{cookiecutter.project_name}}::db' do it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with( :connection => 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite', :connection_recycle_time => '', - :min_pool_size => '', :db_max_retries => '', :max_pool_size => '', :max_retries => '', @@ -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_recycle_time => '3601', - :database_min_pool_size => '2', :database_db_max_retries => '-1', :database_max_retries => '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( :connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}', :connection_recycle_time => '3601', - :min_pool_size => '2', :db_max_retries => '-1', :max_pool_size => '11', :max_retries => '11',