openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Update designate::db class to match other module pattern"

This commit is contained in:
Jenkins 2016-01-07 04:45:53 +00:00 committed by Gerrit Code Review
parent 85a3472c8a 135a1aca3b
commit 2187d1ba1b
2 changed files with 94 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
manifests/db.pp
View File

@ -7,21 +7,61 @@
#
# == Parameters
#
# [*database_connection*]
# the connection string. format: [driver]://[user]:[password]@[host]/[database]
# [*database_connection*]
# Url used to connect to database.
# (Optional) Defaults to 'mysql://designate:designate@localhost/designate'.
#
# [*sync_db*]
# Enable dbsync.
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# (Optional) Defaults to 3600.
#
# [*database_min_pool_size*]
# Minimum number of SQL connections to keep open in a pool.
# (Optional) Defaults to 1.
#
# [*database_max_pool_size*]
# Maximum number of SQL connections to keep open in a pool.
# (Optional) Defaults to 10.
#
# [*database_max_retries*]
# Maximum db connection retries during startup.
# Setting -1 implies an infinite retry count.
# (Optional) Defaults to 10.
#
# [*database_retry_interval*]
# Interval between retries of opening a sql connection.
# (Optional) Defaults to 10.
#
# [*database_max_overflow*]
# If set, use this value for max_overflow with sqlalchemy.
# (Optional) Defaults to 20.
#
# [*sync_db*]
# (Optional) Run db sync on nodes after connection setting has been set.
# Defaults to true
#
# [*sync_db*]
# Enable dbsync.
#
class designate::db (
$database_connection = 'mysql://designate:designate@localhost/designate',
$sync_db = true,
$database_connection = 'mysql://designate:designate@localhost/designate',
$database_idle_timeout = 3600,
$database_min_pool_size = 1,
$database_max_pool_size = 10,
$database_max_retries = 10,
$database_retry_interval = 10,
$database_max_overflow = 20,
$sync_db = true,
) {
include ::designate::params
validate_re($database_connection,
'(mysql):\/\/(\S+:\S+@\S+\/\S+)?')
case $database_connection {
/^mysql:\/\//: {
$backend_package = false
require 'mysql::bindings'
require 'mysql::bindings::python'
}
@ -30,8 +70,22 @@ class designate::db (
}
}
if $backend_package and !defined(Package[$backend_package]) {
package {'designate-backend-package':
ensure => present,
name => $backend_package,
tag => 'openstack',
}
}
designate_config {
'storage:sqlalchemy/connection': value => $database_connection, secret => true;
'storage:sqlalchemy/connection': value => $database_connection, secret => true;
'storage:sqlalchemy/idle_timeout': value => $database_idle_timeout;
'storage:sqlalchemy/min_pool_size': value => $database_min_pool_size;
'storage:sqlalchemy/max_retries': value => $database_max_retries;
'storage:sqlalchemy/retry_interval': value => $database_retry_interval;
'storage:sqlalchemy/max_pool_size': value => $database_max_pool_size;
'storage:sqlalchemy/max_overflow': value => $database_max_overflow;
}
if $sync_db {

43
spec/classes/designate_db_spec.rb
View File

@ -5,18 +5,41 @@ require 'spec_helper'
describe 'designate::db' do
shared_examples 'designate-db' do
shared_examples 'designate::db' do
context 'with default params' do
it 'configures designate db with default parameters' do
is_expected.to contain_designate_config('storage:sqlalchemy/connection').with_value('mysql://designate:designate@localhost/designate')
is_expected.to contain_class('mysql::bindings')
is_expected.to contain_class('mysql::bindings::python')
context 'with default parameters' do
it { is_expected.to contain_designate_config('storage:sqlalchemy/connection').with_value('mysql://designate:designate@localhost/designate').with_secret(true) }
it { is_expected.to contain_designate_config('storage:sqlalchemy/idle_timeout').with_value('3600') }
it { is_expected.to contain_designate_config('storage:sqlalchemy/min_pool_size').with_value('1') }
it { is_expected.to contain_designate_config('storage:sqlalchemy/max_retries').with_value('10') }
it { is_expected.to contain_designate_config('storage:sqlalchemy/retry_interval').with_value('10') }
end
context 'with specific parameters' do
let :params do
{ :database_connection => 'mysql://designate:designate@localhost/designate',
:database_idle_timeout => '3601',
:database_min_pool_size => '2',
:database_max_retries => '11',
:database_retry_interval => '11', }
end
it 'includes designate::db::sync' do
is_expected.to contain_class('designate::db::sync')
it { is_expected.to contain_designate_config('storage:sqlalchemy/connection').with_value('mysql://designate:designate@localhost/designate').with_secret(true) }
it { is_expected.to contain_designate_config('storage:sqlalchemy/idle_timeout').with_value('3601') }
it { is_expected.to contain_designate_config('storage:sqlalchemy/min_pool_size').with_value('2') }
it { is_expected.to contain_designate_config('storage:sqlalchemy/max_retries').with_value('11') }
it { is_expected.to contain_designate_config('storage:sqlalchemy/retry_interval').with_value('11') }
end
context 'with incorrect database_connection string' do
let :params do
{ :database_connection => 'redis://designate:designate@localhost/designate', }
end
it_raises 'a Puppet::Error', /validate_re/
end
end
@ -26,7 +49,7 @@ describe 'designate::db' do
{ :osfamily => 'Debian' }
end
it_configures 'designate-db'
it_configures 'designate::db'
end
context 'on RedHat platforms' do
@ -34,7 +57,7 @@ describe 'designate::db' do
{ :osfamily => 'RedHat' }
end
it_configures 'designate-db'
it_configures 'designate::db'
end
end