From 37dbbe2960fb70ca9fcf0e4aa7d18ea45c940258 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 22 Mar 2022 14:02:37 +0900 Subject: [PATCH] Do not override defaults of oslo.db parameters ... but use the original defaults, because these are considered to be reasonable values to start with. Change-Id: I243aacab2fe4c1dac9fe383109866b3ccbcd0f26 --- manifests/db.pp | 8 ++++---- spec/classes/designate_db_spec.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index 1fa6c4f5..ed0dc111 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -53,11 +53,11 @@ class designate::db ( $database_db_max_retries = $::os_service_default, $database_connection = 'mysql://designate:designate@localhost/designate', - $database_max_pool_size = 10, + $database_max_pool_size = $::os_service_default, $database_connection_recycle_time = $::os_service_default, - $database_max_retries = 10, - $database_retry_interval = 10, - $database_max_overflow = 20, + $database_max_retries = $::os_service_default, + $database_retry_interval = $::os_service_default, + $database_max_overflow = $::os_service_default, $database_pool_timeout = $::os_service_default, $mysql_enable_ndb = $::os_service_default, $sync_db = true, diff --git a/spec/classes/designate_db_spec.rb b/spec/classes/designate_db_spec.rb index 89403ba0..f8a2c304 100644 --- a/spec/classes/designate_db_spec.rb +++ b/spec/classes/designate_db_spec.rb @@ -10,10 +10,10 @@ describe 'designate::db' do :db_max_retries => '', :connection => 'mysql://designate:designate@localhost/designate', :connection_recycle_time => '', - :max_pool_size => 10, - :max_retries => 10, - :retry_interval => 10, - :max_overflow => 20, + :max_pool_size => '', + :max_retries => '', + :retry_interval => '', + :max_overflow => '', :pool_timeout => '', :mysql_enable_ndb => '', )}