Merge "Only designate-central and mdns require database access"

This commit is contained in:
Zuul 2018-11-06 17:14:11 +00:00 committed by Gerrit Code Review
commit 9e5cdcee67
5 changed files with 10 additions and 1 deletions

View File

@ -69,6 +69,7 @@ class designate::central (
) inherits designate { ) inherits designate {
include ::designate::deps include ::designate::deps
include ::designate::db
designate_config { designate_config {
'service:central/managed_resource_email' : value => $managed_resource_email; 'service:central/managed_resource_email' : value => $managed_resource_email;

View File

@ -41,7 +41,6 @@ define designate::generic_service(
include ::designate::deps include ::designate::deps
include ::designate::params include ::designate::params
include ::designate::db
$designate_title = "designate-${name}" $designate_title = "designate-${name}"
Exec['post-designate_config'] ~> Anchor['designate::service::end'] Exec['post-designate_config'] ~> Anchor['designate::service::end']

View File

@ -68,6 +68,7 @@ class designate::mdns (
) inherits designate { ) inherits designate {
include ::designate::deps include ::designate::deps
include ::designate::db
designate_config { designate_config {
'service:mdns/workers' : value => $workers; 'service:mdns/workers' : value => $workers;

View File

@ -26,6 +26,10 @@ describe 'designate::central' do
) )
end end
it 'includes designate::db' do
is_expected.to contain_class('designate::db')
end
it 'configures designate-central with default parameters' do it 'configures designate-central with default parameters' do
is_expected.to contain_designate_config('service:central/managed_resource_email').with_value('hostmaster@example.com') is_expected.to contain_designate_config('service:central/managed_resource_email').with_value('hostmaster@example.com')
is_expected.to contain_designate_config('service:central/managed_resource_tenant_id').with_value('123456') is_expected.to contain_designate_config('service:central/managed_resource_tenant_id').with_value('123456')

View File

@ -27,6 +27,10 @@ describe 'designate::mdns' do
) )
end end
it 'includes designate::db' do
is_expected.to contain_class('designate::db')
end
it 'configures designate-mdns with default parameters' do it 'configures designate-mdns with default parameters' do
is_expected.to contain_designate_config('service:mdns/workers').with_value(8) is_expected.to contain_designate_config('service:mdns/workers').with_value(8)
is_expected.to contain_designate_config('service:mdns/threads').with_value('<SERVICE DEFAULT>') is_expected.to contain_designate_config('service:mdns/threads').with_value('<SERVICE DEFAULT>')