Merge "Add mysql_enable_ndb option"
This commit is contained in:
commit
e656d11e78
|
@ -33,6 +33,11 @@
|
||||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||||
# Defaults to $::os_service_default
|
# 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*]
|
# [*database_db_max_retries*]
|
||||||
# (Optional) Maximum retries in case of connection error or deadlock error
|
# (Optional) Maximum retries in case of connection error or deadlock error
|
||||||
# before error is raised. Set to -1 to specify an infinite retry count.
|
# before error is raised. Set to -1 to specify an infinite retry count.
|
||||||
|
@ -46,6 +51,7 @@ class neutron::db (
|
||||||
$database_retry_interval = $::os_service_default,
|
$database_retry_interval = $::os_service_default,
|
||||||
$database_max_overflow = $::os_service_default,
|
$database_max_overflow = $::os_service_default,
|
||||||
$database_pool_timeout = $::os_service_default,
|
$database_pool_timeout = $::os_service_default,
|
||||||
|
$mysql_enable_ndb = $::os_service_default,
|
||||||
$database_db_max_retries = $::os_service_default,
|
$database_db_max_retries = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
@ -64,6 +70,7 @@ class neutron::db (
|
||||||
max_pool_size => $database_max_pool_size,
|
max_pool_size => $database_max_pool_size,
|
||||||
max_overflow => $database_max_overflow,
|
max_overflow => $database_max_overflow,
|
||||||
pool_timeout => $database_pool_timeout,
|
pool_timeout => $database_pool_timeout,
|
||||||
|
mysql_enable_ndb => $mysql_enable_ndb,
|
||||||
db_max_retries => $database_db_max_retries,
|
db_max_retries => $database_db_max_retries,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Add mysql_enable_ndb parameter to select mysql storage engine.
|
|
@ -12,6 +12,7 @@ describe 'neutron::db' do
|
||||||
:retry_interval => '<SERVICE DEFAULT>',
|
:retry_interval => '<SERVICE DEFAULT>',
|
||||||
:max_overflow => '<SERVICE DEFAULT>',
|
:max_overflow => '<SERVICE DEFAULT>',
|
||||||
:pool_timeout => '<SERVICE DEFAULT>',
|
:pool_timeout => '<SERVICE DEFAULT>',
|
||||||
|
:mysql_enable_ndb => '<SERVICE DEFAULT>',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -26,6 +27,7 @@ describe 'neutron::db' do
|
||||||
:database_db_max_retries => '-1',
|
:database_db_max_retries => '-1',
|
||||||
:database_max_overflow => '21',
|
:database_max_overflow => '21',
|
||||||
:database_pool_timeout => '21',
|
:database_pool_timeout => '21',
|
||||||
|
:mysql_enable_ndb => true,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -38,6 +40,7 @@ describe 'neutron::db' do
|
||||||
:retry_interval => '11',
|
:retry_interval => '11',
|
||||||
:max_overflow => '21',
|
:max_overflow => '21',
|
||||||
:pool_timeout => '21',
|
:pool_timeout => '21',
|
||||||
|
:mysql_enable_ndb => true,
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue