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

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;

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']

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;

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')

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('<SERVICE DEFAULT>')