Merge "Use native puppet-dns interface to inject additional options"

manifests/backend/bind9.pp

@@ -79,26 +79,23 @@ class designate::backend::bind9 (
   include designate::params
 
   if $configure_bind {
-    if $rndc_controls {
+    $dns_additional_options = {
-      class { 'dns':
+      'allow-new-zones'   => 'yes',
-        controls => $rndc_controls,
+      # Recommended by Designate docs as a mitigation for potential cache
-      }
+      # poisoning attacks:
-    } else {
+      # https://docs.openstack.org/designate/latest/admin/production-guidelines.html#bind9-mitigation
-      include dns
+      'minimal-responses' => 'yes',
-    }
-    concat::fragment { 'dns allow-new-zones':
-      target  => $::dns::optionspath,
-      content => 'allow-new-zones yes;',
-      order   => '20',
     }
 
-    # Recommended by Designate docs as a mitigation for potential cache
+    if $rndc_controls {
-    # poisoning attacks:
+      class { 'dns':
-    # https://docs.openstack.org/designate/latest/admin/production-guidelines.html#bind9-mitigation
+        controls           => $rndc_controls,
-    concat::fragment { 'dns minimal-responses':
+        additional_options => $dns_additional_options,
-      target  => $::dns::optionspath,
+      }
-      content => 'minimal-responses yes;',
+    } else {
-      order   => '21',
+      class { 'dns':
+        additional_options => $dns_additional_options,
+      }
     }
 
     # /var/named is root:named on RedHat and /var/cache/bind is root:bind on

spec/classes/designate_backend_bind9_spec.rb

@@ -11,9 +11,11 @@ describe 'designate::backend::bind9' do
         {}
       end
       it 'configures named and pool' do
-        is_expected.to contain_concat_fragment('dns allow-new-zones').with(
+        is_expected.to contain_class('dns').with(
-          :target => platform_params[:dns_optionspath],
+          :additional_options => {
-          :content => 'allow-new-zones yes;'
+            'allow-new-zones'   => 'yes',
+            'minimal-responses' => 'yes'
+          },
         )
         is_expected.to contain_file('/etc/designate/pools.yaml').with(
           :ensure => 'present',
@@ -36,7 +38,7 @@ describe 'designate::backend::bind9' do
         { :configure_bind => false }
       end
       it 'does not configure named' do
-        is_expected.not_to contain_concat_fragment('dns allow-new-zones')
+        is_expected.to_not contain_class('dns')
       end
     end