Merge "Add mysql_enable_ndb option"
This commit is contained in:
commit
0c54350b8e
@ -33,6 +33,11 @@
|
||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*mysql_enable_ndb*]
|
||||
# (Optional) If True, transparently enables support for handling MySQL
|
||||
# Cluster (NDB).
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*database_db_max_retries*]
|
||||
# (Optional) Maximum retries in case of connection error or deadlock error
|
||||
# before error is raised. Set to -1 to specify an infinite retry count.
|
||||
@ -52,6 +57,7 @@ class octavia::db (
|
||||
$database_retry_interval = $::os_service_default,
|
||||
$database_max_overflow = $::os_service_default,
|
||||
$database_pool_timeout = $::os_service_default,
|
||||
$mysql_enable_ndb = $::os_service_default,
|
||||
$database_db_max_retries = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
@ -84,6 +90,7 @@ class octavia::db (
|
||||
retry_interval => $database_retry_interval_real,
|
||||
max_overflow => $database_max_overflow_real,
|
||||
pool_timeout => $database_pool_timeout_real,
|
||||
mysql_enable_ndb => $mysql_enable_ndb,
|
||||
db_max_retries => $database_db_max_retries_real,
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Add mysql_enable_ndb parameter to select mysql storage engine.
|
@ -12,6 +12,7 @@ describe 'octavia::db' do
|
||||
:retry_interval => '<SERVICE DEFAULT>',
|
||||
:max_overflow => '<SERVICE DEFAULT>',
|
||||
:pool_timeout => '<SERVICE DEFAULT>',
|
||||
:mysql_enable_ndb => '<SERVICE DEFAULT>',
|
||||
)}
|
||||
end
|
||||
|
||||
@ -25,6 +26,7 @@ describe 'octavia::db' do
|
||||
:database_max_pool_size => '11',
|
||||
:database_max_overflow => '21',
|
||||
:database_pool_timeout => '21',
|
||||
:mysql_enable_ndb => true,
|
||||
:database_db_max_retries => '-1',
|
||||
}
|
||||
end
|
||||
@ -38,6 +40,7 @@ describe 'octavia::db' do
|
||||
:retry_interval => '11',
|
||||
:max_overflow => '21',
|
||||
:pool_timeout => '21',
|
||||
:mysql_enable_ndb => true,
|
||||
)}
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user