Merge "Add mysql_enable_ndb option"
This commit is contained in:
commit
5db94a1a65
@ -44,6 +44,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
|
||||||
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*database_min_pool_size*]
|
# [*database_min_pool_size*]
|
||||||
@ -59,6 +64,7 @@ class ceilometer::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,
|
||||||
$sync_db = true,
|
$sync_db = true,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$database_min_pool_size = undef,
|
$database_min_pool_size = undef,
|
||||||
@ -79,6 +85,7 @@ class ceilometer::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,
|
||||||
}
|
}
|
||||||
|
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Add mysql_enable_ndb parameter to select mysql storage engine.
|
@ -14,6 +14,7 @@ describe 'ceilometer::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>',
|
||||||
)}
|
)}
|
||||||
|
|
||||||
it { should contain_class('ceilometer::db::sync') }
|
it { should contain_class('ceilometer::db::sync') }
|
||||||
@ -30,6 +31,7 @@ describe 'ceilometer::db' do
|
|||||||
:database_retry_interval => '11',
|
:database_retry_interval => '11',
|
||||||
:database_max_overflow => '21',
|
:database_max_overflow => '21',
|
||||||
:database_pool_timeout => '21',
|
:database_pool_timeout => '21',
|
||||||
|
:mysql_enable_ndb => true,
|
||||||
:sync_db => false }
|
:sync_db => false }
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -44,6 +46,7 @@ describe 'ceilometer::db' do
|
|||||||
:retry_interval => '11',
|
:retry_interval => '11',
|
||||||
:max_overflow => '21',
|
:max_overflow => '21',
|
||||||
:pool_timeout => '21',
|
:pool_timeout => '21',
|
||||||
|
:mysql_enable_ndb => true,
|
||||||
)}
|
)}
|
||||||
|
|
||||||
it { should_not contain_class('ceilometer::db::sync') }
|
it { should_not contain_class('ceilometer::db::sync') }
|
||||||
|
Loading…
Reference in New Issue
Block a user