Fixed DNS templates and added support for Ubuntu 12.04 's way of creating resolv.conf.

dns/templates/db.erb

@@ -14,9 +14,11 @@ $ORIGIN <%= zone %>.
 ;
 @      IN      NS      <%= v['ns'] %>.
 <% end -%>
+<% if slaves != [] %>
 <% slaves.each_pair do |k, v| -%>
 @      IN      NS      <%= v['ns'] %>.
 <% end -%>
+<% end -%>
 <% if zone.match(/\//) %>
 $INCLUDE <%= zonedir %>/db.<%= zone.sub(/\//, '-') %>-dynamic
 $INCLUDE <%= zonedir %>/db.<%= zone.sub(/\//, '-') %>-static

dns/templates/zone.slave.erb

@@ -5,6 +5,10 @@ zone "<%= zone %>" {
 <% else -%>
     file "<%= zonedir %>/db.<%= zone %>";
 <% end -%>
-    masters { <%= master %>; };
+    masters { 
+    <%     masters.each_pair do |k, v| -%>
+        <%= v['ip'] %>;
+    <%     end -%>
+    };
     allow-transfer { none; };
 };

network/manifests/init.pp

@@ -109,6 +109,10 @@ class network::hostname {
 #       Ethernet address. Overrides udev configuration.
 #   $netmask:
 #       Netmask for interface. Required only when $ipaddr is used.
+#   $dnsnameservers:
+#       IP addresses of DNS name servers (separated by space).
+#   $dnssearch:
+#       Search list for domain name lookup (separated by space).
 #   $ip6addr:
 #       IPv6 address for interface. Use auto for autoconfigured address.
 #       Defaults to none.
@@ -130,6 +134,7 @@ class network::hostname {
 # }
 #
 define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none",
+			  $dnsnameservers = "none", $dnssearch = "none",
                           $ip6addr = "none", $ip6netmask = "64",
                           $bridge = [], $options = [], $postcmd = []) {
 

network/templates/interfaces-if.erb

@@ -11,6 +11,12 @@ iface <%= name %> inet <%= proto %>
 <% if netmask != 'none' -%>
     netmask <%= netmask %>
 <% end -%>
+<% if dnssearch != 'none' -%>
+    dns-search <%= dnssearch %>
+<% end -%>
+<% if dnsnameservers != 'none' -%>
+    dns-nameservers <%= dnsnameservers %>
+<% end -%>
 <% options.each do |val| -%>
     <%= val %>
 <% end -%>