Modify templates to be puppet 3.x compliant

Author: javierbertoli

templates/named.conf-header.erb

@@ -1,6 +1,7 @@
-// File managed by puppet
+// This file is managed by Puppet. DO NOT EDIT.
+
 options {
-        directory "<%= data_dir %>";
+        directory "<%= @data_dir %>";
         auth-nxdomain no;
         listen-on-v6 { any; };
         recursion yes;

templates/named.conf-zone.erb

@@ -1,14 +1,16 @@
-zone "<%= zone_name %>" {
-  type <%= zone_type %>;
-<% if zone_type == 'slave' or zone_type == 'master' or zone_type == 'hint' -%>
-  file "<%= scope.lookupvar("bind::config_dir") %>/<%= zone_config_file %>";
+// This file is managed by Puppet. DO NOT EDIT.
+
+zone "<%= @zone_name %>" {
+  type <%= @zone_type %>;
+<% if @zone_type == 'slave' or @zone_type == 'master' or @zone_type == 'hint' -%>
+  file "<%= scope.lookupvar("bind::config_dir") %>/<%= @zone_config_file %>";
 <% end -%>
-<% if zone_type == 'slave' -%>
-  masters { <%= zone_master %>; };
+<% if @zone_type == 'slave' -%>
+  masters { <%= @zone_master %>; };
 <% end -%>
-<% if zone_type == 'forward' -%>
+<% if @zone_type == 'forward' -%>
   forwarders {
-<% zone_forward.each do |forwarder|-%>
+<% @zone_forward.each do |forwarder|-%>
     <%= forwarder %>;
 <% end -%>
   };

templates/record.erb

@@ -1 +1 @@
-<%= host %> <%= ttl %> <%= record_class %> <%= record_type %> <%= record_priority %> <%= target %>
+<%= @host %> <%= @ttl %> <%= @record_class %> <%= @record_type %> <%= @record_priority %> <%= @target %>

templates/spec.erb

@@ -4,5 +4,5 @@
 <%= scope.to_hash.reject { |k,v| !( k.is_a?(String) && v.is_a?(String) ) }.to_yaml %>
 
 # Custom Options
-<%= options['opt_a'] %>
-<%= options['opt_b'] %>
+<%= @options['opt_a'] %>
+<%= @options['opt_b'] %>

templates/zone-header.erb

@@ -1,14 +1,14 @@
-; File managed by puppet
+; This file is managed by Puppet. DO NOT EDIT.
 
-<% if zone_ttl != '' -%>
-$TTL <%=zone_ttl%>
+<% if @zone_ttl != '' -%>
+$TTL <%= @zone_ttl %>
 <% end -%>
-@ <%= zone_class %> SOA <%= real_zone_ns %> <%= real_zone_contact %> (
-      <%= zone_serial %>  ; serial
-      <%= zone_refresh %> ; refresh
-      <%= zone_retry %>   ; retry
-      <%= zone_expire %>  ; expire
-<% if zone_neg_cache != '' -%>
-      <%= zone_neg_cache %> ; TTL
+@ <%= @zone_class %> SOA <%= @real_zone_ns %> <%= @real_zone_contact %> (
+      <%= @zone_serial %>  ; serial
+      <%= @zone_refresh %> ; refresh
+      <%= @zone_retry %>   ; retry
+      <%= @zone_expire %>  ; expire
+<% if @zone_neg_cache != '' -%>
+      <%= @zone_neg_cache %> ; TTL
 <% end -%>
     );