Add freezer::deps to freezer::db
So it's consistent on all modules. Change-Id: I22978072f1822072cfb1fa383b9f95e86f36292d
This commit is contained in:
parent
2958186767
commit
b0903faa3f
|
@ -54,6 +54,8 @@ class freezer::db (
|
||||||
$database_pool_timeout = $::os_service_default,
|
$database_pool_timeout = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
include ::freezer::deps
|
||||||
|
|
||||||
validate_re($database_connection,
|
validate_re($database_connection,
|
||||||
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
|
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,8 @@ require 'spec_helper'
|
||||||
describe 'freezer::db' do
|
describe 'freezer::db' do
|
||||||
shared_examples 'freezer::db' do
|
shared_examples 'freezer::db' do
|
||||||
context 'with default parameters' do
|
context 'with default parameters' do
|
||||||
|
it { should contain_class('freezer::deps') }
|
||||||
|
|
||||||
it { should contain_oslo__db('freezer_config').with(
|
it { should contain_oslo__db('freezer_config').with(
|
||||||
:db_max_retries => '<SERVICE DEFAULT>',
|
:db_max_retries => '<SERVICE DEFAULT>',
|
||||||
:connection => 'sqlite:////var/lib/freezer/freezer.sqlite',
|
:connection => 'sqlite:////var/lib/freezer/freezer.sqlite',
|
||||||
|
@ -31,6 +33,8 @@ describe 'freezer::db' do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it { should contain_class('freezer::deps') }
|
||||||
|
|
||||||
it { should contain_oslo__db('freezer_config').with(
|
it { should contain_oslo__db('freezer_config').with(
|
||||||
:db_max_retries => '-1',
|
:db_max_retries => '-1',
|
||||||
:connection => 'mysql+pymysql://freezer:freezer@localhost/freezer',
|
:connection => 'mysql+pymysql://freezer:freezer@localhost/freezer',
|
||||||
|
|
Loading…
Reference in New Issue