[bug 12825] domain-name/search factorized for kavlan_id<=9, factorized...

[bug 12825] domain-name/search factorized for kavlan_id<=9, factorized next-server use kadeploy fqdn for kavlan_id between 4-9

lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb

@@ -23,7 +23,6 @@ option pxelinux.magic      code 208 = string;
 option pxelinux.configfile code 209 = text;
 option pxelinux.pathprefix code 210 = text;
 option pxelinux.reboottime code 211 = unsigned integer 32;
-#option vendorinfo          code 43  = string;
 site-option-space "pxelinux";
 
 option pxelinux.magic f1:00:74:7e;
@@ -71,13 +70,19 @@ subnet6 <%= kavlan['network_ipv6'] %> {
 <% end -%>
     default-lease-time 86400;
     max-lease-time 604800;
+<%     if kavlan_id.to_i <= 9 -%>
+    option domain-name "<%= "#{site_uid}.grid5000.fr" %>";
+    option domain-search "<%= "#{site_uid}.grid5000.fr" %>", "grid5000.fr";
+<%     end -%>
     option domain-name-servers <%= kavlan_id.to_i.between?(1, 3)? kavlan['gateway'] : "dns.#{site_uid}.grid5000.fr" %>;
     option ntp-servers <%= kavlan_id.to_i.between?(1, 3)? kavlan['gateway'] : "ntp.#{site_uid}.grid5000.fr" %>;
     option routers <%= kavlan['gateway'] %>;
 <% if dhcpkind == 'dhcpd' -%>
     option subnet-mask <%= kavlan_ip.netmask %>;
     option broadcast-address <%= kavlan_ip.broadcast %>;
-    next-server <%= kadeploy_ip %>;
+<%     if kavlan_id.to_i <= 9 -%>
+    next-server <%= kavlan_id.to_i <= 3 ? kadeploy_ip : "kadeploy.#{site_uid}.grid5000.fr" %>;
+<%     end -%>
 <% end -%>
 }
 
@@ -103,8 +108,10 @@ refapi['sites'].sort.to_h.each_key do |site|
 host <%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-kavlan-<%= kavlan_id %>.<%= site %>.grid5000.fr {
   hardware ethernet <%= interface['mac'].downcase() %>;
   option host-name "<%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-kavlan-<%= kavlan_id %>";
+<%     if kavlan_id.to_i > 9 -%>
   option domain-name "<%= site %>.grid5000.fr";
   option domain-search "<%= site %>.grid5000.fr", "grid5000.fr";
+<%     end -%>
   fixed-address <%= node['kavlan'][interface['device']]["kavlan-#{kavlan_id}"] %>;
 <%     if kavlan_id.to_i > 9 -%>
   next-server kadeploy.<%= site %>.grid5000.fr;
@@ -116,8 +123,10 @@ host <%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-ka
 host <%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-kavlan-<%= kavlan_id %>-ipv6.<%= site %>.grid5000.fr {
   hardware ethernet <%= interface['mac'].downcase() %>;
   option host-name "<%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-kavlan-<%= kavlan_id %>-ipv6";
+<%     if kavlan_id.to_i > 9 -%>
   option domain-name "<%= site %>.grid5000.fr";
   option domain-search "<%= site %>.grid5000.fr", "grid5000.fr";
+<%     end -%>
   fixed-address6 <%= node['kavlan6'][interface['device']]["kavlan-#{kavlan_id}"] %>;
 }
 <%