From 5466d6e6820291c73f546c41e3265c15683650c4 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Sun, 28 Apr 2019 15:00:14 +0800 Subject: [PATCH] Deprecate idle_timeout option The idle_timeout parameter is deprecated, use connection_recycle_time instead[1]. [1]https://review.opendev.org/#/c/334182/ Change-Id: Ic91d2eb60c27ed407c9ba58acf4c2d7eb4666423 Depends-On: https://review.opendev.org/656106/ Closes-Bug: #1826692 --- .../manifests/db.pp | 38 ++++++------- .../{{cookiecutter.project_name}}_db_spec.rb | 54 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/puppet-{{cookiecutter.project_name}}/manifests/db.pp b/puppet-{{cookiecutter.project_name}}/manifests/db.pp index 83eeaf8..2deea01 100644 --- a/puppet-{{cookiecutter.project_name}}/manifests/db.pp +++ b/puppet-{{cookiecutter.project_name}}/manifests/db.pp @@ -8,7 +8,7 @@ # (Optional) Url used to connect to database. # Defaults to 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite'. # -# [*database_idle_timeout*] +# [*database_connection_recycle_time*] # (Optional) Timeout when db connections should be reaped. # Defaults to $::os_service_default # @@ -43,15 +43,15 @@ # Defaults to $::os_service_default # class {{cookiecutter.project_name}}::db ( - $database_connection = 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite', - $database_idle_timeout = $::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, + $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, + $database_retry_interval = $::os_service_default, + $database_max_overflow = $::os_service_default, + $database_pool_timeout = $::os_service_default, ) { include ::{{cookiecutter.project_name}}::deps @@ -60,14 +60,14 @@ class {{cookiecutter.project_name}}::db ( ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) oslo::db { '{{cookiecutter.project_name}}_config': - connection => $database_connection, - idle_timeout => $database_idle_timeout, - min_pool_size => $database_min_pool_size, - db_max_retries => $database_db_max_retries, - 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, + 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, + max_pool_size => $database_max_pool_size, + max_overflow => $database_max_overflow, + pool_timeout => $database_pool_timeout, } } 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 60f8c27..3393aca 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 @@ -6,45 +6,45 @@ describe '{{cookiecutter.project_name}}::db' do it { should contain_class('{{cookiecutter.project_name}}::deps') } it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with( - :connection => 'sqlite:////var/lib/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.sqlite', - :idle_timeout => '', - :min_pool_size => '', - :db_max_retries => '', - :max_pool_size => '', - :max_retries => '', - :retry_interval => '', - :max_overflow => '', - :pool_timeout => '', + :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 => '', + :retry_interval => '', + :max_overflow => '', + :pool_timeout => '', )} end context 'with specific parameters' do let :params do { - :database_connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}', - :database_idle_timeout => '3601', - :database_min_pool_size => '2', - :database_db_max_retries => '-1', - :database_max_retries => '11', - :database_retry_interval => '11', - :database_max_pool_size => '11', - :database_max_overflow => '21', - :database_pool_timeout => '21', + :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', + :database_max_pool_size => '11', + :database_max_overflow => '21', + :database_pool_timeout => '21', } end it { should contain_class('{{cookiecutter.project_name}}::deps') } it { should contain_oslo__db('{{cookiecutter.project_name}}_config').with( - :connection => 'mysql+pymysql://{{cookiecutter.project_name}}:{{cookiecutter.project_name}}@localhost/{{cookiecutter.project_name}}', - :idle_timeout => '3601', - :min_pool_size => '2', - :db_max_retries => '-1', - :max_pool_size => '11', - :max_retries => '11', - :retry_interval => '11', - :max_overflow => '21', - :pool_timeout => '21', + :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', + :retry_interval => '11', + :max_overflow => '21', + :pool_timeout => '21', )} end end