Add mysql_enable_ndb option

Add mysql_enable_ndb parameter to select mysql storage engine.

Change-Id: If3d204f6807937cacbb9e8cc541cc3c230b1b670
Depends-On: https://review.opendev.org/#/c/748067
Closes-Bug: #1892952
This commit is contained in:
ZhongShengping 2020-08-26 11:53:17 +08:00
parent 3f682aa5dd
commit 841f27fc03
5 changed files with 24 additions and 0 deletions

View File

@ -38,6 +38,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
#
# DEPRECATED PARAMETERS
#
# [*database_min_pool_size*]
@ -53,6 +58,7 @@ class ironic::db (
$database_max_overflow = $::os_service_default,
$database_db_max_retries = $::os_service_default,
$database_pool_timeout = $::os_service_default,
$mysql_enable_ndb = $::os_service_default,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {
@ -85,6 +91,7 @@ class ironic::db (
max_overflow => $database_max_overflow_real,
db_max_retries => $database_db_max_retries,
pool_timeout => $database_pool_timeout,
mysql_enable_ndb => $mysql_enable_ndb,
}
}

View File

@ -38,6 +38,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
#
# DEPRECATED PARAMETERS
#
# [*database_min_pool_size*]
@ -53,6 +58,7 @@ class ironic::inspector::db (
$database_max_pool_size = $::os_service_default,
$database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default,
$mysql_enable_ndb = $::os_service_default,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {
@ -77,6 +83,7 @@ class ironic::inspector::db (
retry_interval => $database_retry_interval,
max_overflow => $database_max_overflow,
pool_timeout => $database_pool_timeout,
mysql_enable_ndb => $mysql_enable_ndb,
}
}

View File

@ -0,0 +1,4 @@
---
features:
- |
Add mysql_enable_ndb parameter to select mysql storage engine.

View File

@ -12,6 +12,7 @@ describe 'ironic::db' do
:max_pool_size => '<SERVICE DEFAULT>',
:max_retries => '<SERVICE DEFAULT>',
:pool_timeout => '<SERVICE DEFAULT>',
:mysql_enable_ndb => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
)}
@ -25,6 +26,7 @@ describe 'ironic::db' do
:database_max_pool_size => '21',
:database_max_retries => '11',
:database_pool_timeout => '21',
:mysql_enable_ndb => true,
:database_max_overflow => '21',
:database_retry_interval => '11',
:database_db_max_retries => '-1',
@ -42,6 +44,7 @@ describe 'ironic::db' do
:retry_interval => '11',
:max_overflow => '21',
:pool_timeout => '21',
:mysql_enable_ndb => true,
)}
end
end

View File

@ -12,6 +12,7 @@ describe 'ironic::inspector::db' do
:max_retries => '<SERVICE DEFAULT>',
:db_max_retries => '<SERVICE DEFAULT>',
:pool_timeout => '<SERVICE DEFAULT>',
:mysql_enable_ndb => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
)}
@ -27,6 +28,7 @@ describe 'ironic::inspector::db' do
:database_db_max_retries => '11',
:database_max_overflow => '21',
:database_pool_timeout => '21',
:mysql_enable_ndb => true,
:database_retry_interval => '11', }
end
@ -37,6 +39,7 @@ describe 'ironic::inspector::db' do
:max_retries => '11',
:db_max_retries => '11',
:pool_timeout => '21',
:mysql_enable_ndb => true,
:retry_interval => '11',
:max_overflow => '21',
)}