From 98f28388dfae298ef3c76eee0fe5984c5952dad4 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Wed, 21 Apr 2021 14:51:53 +0200
Subject: [PATCH] [gen/{dhcp,kavlan}] serve pxelinux.0 to troll & gros
---
lib/refrepo/gen/puppet/templates/dhcp.erb | 4 ++++
lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb | 3 +++
2 files changed, 7 insertions(+)
diff --git a/lib/refrepo/gen/puppet/templates/dhcp.erb b/lib/refrepo/gen/puppet/templates/dhcp.erb
index 89ce12f6aaa..e60d750740a 100644
--- a/lib/refrepo/gen/puppet/templates/dhcp.erb
+++ b/lib/refrepo/gen/puppet/templates/dhcp.erb
@@ -21,6 +21,7 @@
else
uid_net = h['name']
end
+
if dhcpkind == 'dhcpv6'
if h['ip6']
dhcp_entries.push({ 'uid_net' => uid_net, 'ipv6' => h['ip6'], 'mac' => h['mac'] })
@@ -50,6 +51,9 @@ group {
fixed-address6 <%= node['ipv6'] %>;
<% else -%>
fixed-address <%= node['ipv4'] %>;
+<% end -%>
+<% if node['uid_net'] =~ /^(troll|gros)-\d+$/ -%>
+ filename "/pxelinux.0"
<% end -%>
}
<% } %>
diff --git a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
index 5c81af0ceee..f0b8899d282 100644
--- a/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
@@ -116,6 +116,9 @@ host <%= node_uid %><%= interface['mounted']? "" : "-"+interface['device'] %>-ka
<% if kavlan_id.to_i > 9 -%>
next-server kadeploy.<%= site %>.grid5000.fr;
<% end -%>
+<% if node_uid =~ /^(troll|gros)-\d+$/ -%>
+ filename "/pxelinux.0"
+<% end -%>
}
<%
elsif dhcpkind == 'dhcpd6'
--
GitLab