Merge "Do not override defaults of oslo.db parameters"

This commit is contained in:
Zuul 2022-03-25 17:56:29 +00:00 committed by Gerrit Code Review
commit f32d7ab445
2 changed files with 8 additions and 8 deletions

View File

@ -53,11 +53,11 @@
class designate::db ( class designate::db (
$database_db_max_retries = $::os_service_default, $database_db_max_retries = $::os_service_default,
$database_connection = 'mysql://designate:designate@localhost/designate', $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_connection_recycle_time = $::os_service_default,
$database_max_retries = 10, $database_max_retries = $::os_service_default,
$database_retry_interval = 10, $database_retry_interval = $::os_service_default,
$database_max_overflow = 20, $database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default, $database_pool_timeout = $::os_service_default,
$mysql_enable_ndb = $::os_service_default, $mysql_enable_ndb = $::os_service_default,
$sync_db = true, $sync_db = true,

View File

@ -10,10 +10,10 @@ describe 'designate::db' do
:db_max_retries => '<SERVICE DEFAULT>', :db_max_retries => '<SERVICE DEFAULT>',
:connection => 'mysql://designate:designate@localhost/designate', :connection => 'mysql://designate:designate@localhost/designate',
:connection_recycle_time => '<SERVICE DEFAULT>', :connection_recycle_time => '<SERVICE DEFAULT>',
:max_pool_size => 10, :max_pool_size => '<SERVICE DEFAULT>',
:max_retries => 10, :max_retries => '<SERVICE DEFAULT>',
:retry_interval => 10, :retry_interval => '<SERVICE DEFAULT>',
:max_overflow => 20, :max_overflow => '<SERVICE DEFAULT>',
:pool_timeout => '<SERVICE DEFAULT>', :pool_timeout => '<SERVICE DEFAULT>',
:mysql_enable_ndb => '<SERVICE DEFAULT>', :mysql_enable_ndb => '<SERVICE DEFAULT>',
)} )}