From df6242d66f4fd4269332bfe44fbe9c46cf77d014 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Thu, 7 Nov 2024 20:00:18 -0600 Subject: [PATCH 1/2] Fix dhcp template for static template Signed-off-by: Timothy Middelkoop --- CHANGELOG.md | 1 + overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e899c9..03077315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -122,6 +122,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Make sure that tftp files have unmasked permissions at creation time. #674 - Fix "onboot" behavior for NetworkManager, Debian networking, and Suse wicked. #1278 - Clarified missing steps in Enterprise Linux quickstart. #1179 +- Fix dhcpd.conf static template to include next-server and dhcp-range #1536 ## v4.5.7, 2024-09-11 diff --git a/overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww b/overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww index 386ab842..8c611416 100644 --- a/overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww +++ b/overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww @@ -48,10 +48,8 @@ if exists user-class and option user-class = "iPXE" { subnet {{$.Network}} netmask {{$.Netmask}} { max-lease-time 120; -{{- if ne .Dhcp.Template "static" }} range {{$.Dhcp.RangeStart}} {{$.Dhcp.RangeEnd}}; next-server {{.Ipaddr}}; -{{- end }} } {{- if eq .Dhcp.Template "static" }} From e4a721d87e97f81dcd1e4ac41793e0740cda1311 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Fri, 8 Nov 2024 10:50:17 -0600 Subject: [PATCH 2/2] Remove debian.interfaces from nodes.conf Signed-off-by: Timothy Middelkoop --- CHANGELOG.md | 1 + overlays/host/internal/host_test.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03077315..01112d11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -93,6 +93,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Simplify passing of arguments to commands through `wwctl container exec`. #253 - Don't update IPMI if password isn't set. #638 - Fix issue that `--nettagdel` does not work properly. #1503 +- Fix test for dhcp static configuration #1536 #1537 ## v4.5.8, 2024-10-01 diff --git a/overlays/host/internal/host_test.go b/overlays/host/internal/host_test.go index eb1c16ea..77abba1e 100644 --- a/overlays/host/internal/host_test.go +++ b/overlays/host/internal/host_test.go @@ -218,6 +218,8 @@ if exists user-class and option user-class = "iPXE" { subnet 192.168.0.0 netmask 255.255.255.0 { max-lease-time 120; + range 192.168.0.100 192.168.0.199; + next-server 192.168.0.1; } host node1-default {