Merge "Add freezer::deps to freezer::db"

This commit is contained in:
Zuul 2019-01-19 00:05:29 +00:00 committed by Gerrit Code Review
commit 4c41065beb
2 changed files with 6 additions and 0 deletions

View File

@ -54,6 +54,8 @@ class freezer::db (
$database_pool_timeout = $::os_service_default,
) {
include ::freezer::deps
validate_re($database_connection,
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')

View File

@ -3,6 +3,8 @@ require 'spec_helper'
describe 'freezer::db' do
shared_examples 'freezer::db' do
context 'with default parameters' do
it { should contain_class('freezer::deps') }
it { should contain_oslo__db('freezer_config').with(
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:////var/lib/freezer/freezer.sqlite',
@ -31,6 +33,8 @@ describe 'freezer::db' do
}
end
it { should contain_class('freezer::deps') }
it { should contain_oslo__db('freezer_config').with(
:db_max_retries => '-1',
:connection => 'mysql+pymysql://freezer:freezer@localhost/freezer',