unkinben/puppet-bind
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ocado/empty-zones' into 6.0-prerelease

Browse Source 
Conflicts:
	manifests/view.pp
This commit is contained in:
Nate Riffe 2016-04-20 08:17:51 -05:00
commit 0532e1cd57
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/view.pp
View File

@ -11,6 +11,7 @@ define bind::view (
$recursion_match_only = false, $recursion_match_only = false,
$notify_source = '', $notify_source = '',
$also_notify = [], $also_notify = [],
$empty_zones = '',
$order = '10', $order = '10',
$minimal_responses = false, $minimal_responses = false,
) { ) {

3
templates/view.erb
View File

@ -34,6 +34,9 @@ view "<%= @name %>" {
}; };
<%- end -%> <%- end -%>
<%- end -%> <%- end -%>
<%- if @empty_zones != '' -%>
empty-zones-enable <%= @empty_zones ? 'yes' : 'no' %>;
<%- end -%>
<%- if @servers and @servers.is_a?(Array) -%> <%- if @servers and @servers.is_a?(Array) -%>
<%- @servers.each do |properties| -%> <%- @servers.each do |properties| -%>
<%- raise Puppet::Error, 'view servers must have an ip_addr key' unless properties.has_key?('ip_addr') -%> <%- raise Puppet::Error, 'view servers must have an ip_addr key' unless properties.has_key?('ip_addr') -%>