From 412ca9519c3f34b4b43a112ee1dd088ed45c3146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Mon, 22 Oct 2018 13:41:36 -0400 Subject: [PATCH] Only designate-central and mdns require database access According to Designate architecture documentation, only the designate-central and mdns services require database access. This change removes the designate::db class for generic service and include the designate::db class for services that need it instead. Change-Id: I696745e2d57aade6cbb0fe89e334fddf1beaafdb --- manifests/central.pp | 1 + manifests/generic_service.pp | 1 - manifests/mdns.pp | 1 + spec/classes/designate_central_spec.rb | 4 ++++ spec/classes/designate_mdns_spec.rb | 4 ++++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/central.pp b/manifests/central.pp index 668e0f9a..2a3d0439 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -69,6 +69,7 @@ class designate::central ( ) inherits designate { include ::designate::deps + include ::designate::db designate_config { 'service:central/managed_resource_email' : value => $managed_resource_email; diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index 780133dc..dea85c8e 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -41,7 +41,6 @@ define designate::generic_service( include ::designate::deps include ::designate::params - include ::designate::db $designate_title = "designate-${name}" Exec['post-designate_config'] ~> Anchor['designate::service::end'] diff --git a/manifests/mdns.pp b/manifests/mdns.pp index 4e3c08ca..c77d0597 100644 --- a/manifests/mdns.pp +++ b/manifests/mdns.pp @@ -68,6 +68,7 @@ class designate::mdns ( ) inherits designate { include ::designate::deps + include ::designate::db designate_config { 'service:mdns/workers' : value => $workers; diff --git a/spec/classes/designate_central_spec.rb b/spec/classes/designate_central_spec.rb index c07c24a7..8e546c60 100644 --- a/spec/classes/designate_central_spec.rb +++ b/spec/classes/designate_central_spec.rb @@ -26,6 +26,10 @@ describe 'designate::central' do ) end + it 'includes designate::db' do + is_expected.to contain_class('designate::db') + end + 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_tenant_id').with_value('123456') diff --git a/spec/classes/designate_mdns_spec.rb b/spec/classes/designate_mdns_spec.rb index 4b1e836a..487533c1 100644 --- a/spec/classes/designate_mdns_spec.rb +++ b/spec/classes/designate_mdns_spec.rb @@ -27,6 +27,10 @@ describe 'designate::mdns' do ) end + it 'includes designate::db' do + is_expected.to contain_class('designate::db') + end + 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/threads').with_value('')