diff --git a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb index 0881016c66b160a7e66f20ff0886581179526924..89156cb39a496864d692ef721a56c034e8d3365f 100644 --- a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb +++ b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb @@ -25,6 +25,7 @@ subnet <%= kavlan_ip.network %> netmask <%= kavlan_ip.netmask %> { option broadcast-address <%= kavlan_ip.broadcast %>; filename "pxelinux.0"; next-server <%= "kadeploy.#{site_uid}.grid5000.fr" %>; +} <% refapi['sites'].sort.to_h.each_key do |site| @@ -43,16 +44,16 @@ refapi['sites'].sort.to_h.each_key do |site| next end -%> - 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 %>"; - option domain-name "<%= site %>.grid5000.fr"; - option domain-search "<%= site %>.grid5000.fr", "grid5000.fr"; - fixed-address <%= node['kavlan'][interface['device']]["kavlan-#{kavlan_id}"] %>; -<% if kavlan_id.to_i > 9 -%> - next-server kadeploy.<%= site %>.grid5000.fr; -<% end -%> - } +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 %>"; + option domain-name "<%= site %>.grid5000.fr"; + option domain-search "<%= site %>.grid5000.fr", "grid5000.fr"; + fixed-address <%= node['kavlan'][interface['device']]["kavlan-#{kavlan_id}"] %>; +<% if kavlan_id.to_i > 9 -%> + next-server kadeploy.<%= site %>.grid5000.fr; +<% end -%> +} <% end end @@ -60,4 +61,3 @@ refapi['sites'].sort.to_h.each_key do |site| end end -%> -}