From 0f55437a8455621c062786e6a7bbf887b12e104e Mon Sep 17 00:00:00 2001
From: acourbet <adrien.courbet@inria.fr>
Date: Tue, 23 Oct 2018 14:02:53 +0200
Subject: [PATCH] [generators] advertise kadeploy as tftp server instead of
kavlan gateway
---
generators/puppet/templates/kavlan-dhcp.conf.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generators/puppet/templates/kavlan-dhcp.conf.erb b/generators/puppet/templates/kavlan-dhcp.conf.erb
index ca8fddf9de3..6fa1b13a96c 100644
--- a/generators/puppet/templates/kavlan-dhcp.conf.erb
+++ b/generators/puppet/templates/kavlan-dhcp.conf.erb
@@ -25,7 +25,7 @@ subnet <%= kavlan_ip.network.to_addr %> netmask <%= kavlan_ip.netmask.to_addr %>
option subnet-mask <%= kavlan_ip.netmask.to_addr %>;
option broadcast-address <%= kavlan_ip.broadcast.to_addr %>;
filename "pxelinux.0";
- next-server <%= kavlan_id.to_i.between?(1, 3)? kavlan['gateway'] : "kadeploy.#{site_uid}.grid5000.fr" %>;
+ next-server <%= "kadeploy.#{site_uid}.grid5000.fr" %>;
<%
refapi['sites'].sort.to_h.each_key do |site|
--
GitLab