From b0903faa3fd57daf16449259634d5d02ca41fc70 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 18 Jan 2019 11:08:47 +0100 Subject: [PATCH] Add freezer::deps to freezer::db So it's consistent on all modules. Change-Id: I22978072f1822072cfb1fa383b9f95e86f36292d --- manifests/db.pp | 2 ++ spec/classes/freezer_db_spec.rb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/manifests/db.pp b/manifests/db.pp index 86c239f..41bd315 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -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+)?') diff --git a/spec/classes/freezer_db_spec.rb b/spec/classes/freezer_db_spec.rb index 4d00b20..2f44f88 100644 --- a/spec/classes/freezer_db_spec.rb +++ b/spec/classes/freezer_db_spec.rb @@ -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 => '', :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',