Merge remote-tracking branch 'ocado/empty-zones'

Conflicts: manifests/view.pp
2016-04-20 08:17:27 -05:00
parent db935f8b86 2b8b7ccc41
commit dd03f5a559
2 changed files with 4 additions and 0 deletions
@@ -34,6 +34,9 @@ view "<%= @name %>" {
 	};
 <%-   end -%>
 <%- end -%>
+<%- if @empty_zones != '' -%>
+	empty-zones-enable <%= @empty_zones ? 'yes' : 'no' %>;
+<%- end -%>
 <%- if @servers and @servers.is_a?(Array) -%>
 <%-   @servers.each do |properties| -%>
 <%-     raise Puppet::Error, 'view servers must have an ip_addr key' unless properties.has_key?('ip_addr') -%>