From 3595c4eff4dfd46d06072fa0d4741593d2fafede Mon Sep 17 00:00:00 2001 From: karimb Date: Thu, 14 Jan 2016 23:49:55 +0100 Subject: [PATCH] Set correct options path for bind9 agent When using Red Hat systems and bind9 backend, /etc/named/options.conf should be used so this patch implements this change to accomodate the parameters used in the dns module. Closes-Bug: #1534309 Change-Id: I546aceeb257954afe768bb1ee702a277ed0a2a5a --- manifests/backend/bind9.pp | 2 +- spec/classes/designate_backend_bind9_spec.rb | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/backend/bind9.pp b/manifests/backend/bind9.pp index 4d5e9e1f..19ec1071 100644 --- a/manifests/backend/bind9.pp +++ b/manifests/backend/bind9.pp @@ -38,7 +38,7 @@ class designate::backend::bind9 ( file_line {'dns allow-new-zones': ensure => present, - path => "${::dns::params::namedconf_path}.options", + path => $::dns::params::optionspath, line => 'allow-new-zones yes;', require => Class['::designate'], } diff --git a/spec/classes/designate_backend_bind9_spec.rb b/spec/classes/designate_backend_bind9_spec.rb index d4323388..6b342a4a 100644 --- a/spec/classes/designate_backend_bind9_spec.rb +++ b/spec/classes/designate_backend_bind9_spec.rb @@ -12,7 +12,7 @@ describe 'designate::backend::bind9' do is_expected.to contain_designate_config('backend:bind9/rndc_port').with_value('953') is_expected.to contain_designate_config('backend:bind9/rndc_config_file').with_value('/etc/rndc.conf') is_expected.to contain_designate_config('backend:bind9/rndc_key_file').with_value('/etc/rndc.key') - is_expected.to contain_file_line('dns allow-new-zones') + is_expected.to contain_file_line('dns allow-new-zones').with( :path => platform_params[:dns_optionspath], :line => 'allow-new-zones yes;') end end @@ -54,9 +54,13 @@ describe 'designate::backend::bind9' do let(:platform_params) do case facts[:osfamily] when 'Debian' - { } + { + :dns_optionspath => '/etc/bind/named.conf.options' + } when 'RedHat' - { } + { + :dns_optionspath => '/etc/named/options.conf' + } end end it_behaves_like 'designate-backend-bind9'