From 9fdcdceb0423f1b247abc23440a99733376c79bb Mon Sep 17 00:00:00 2001 From: Brian Phan Date: Tue, 12 Dec 2023 15:35:29 -0800 Subject: [PATCH 1/7] Update 10-persistent-net.link.ww Update Warewulf template to generate a file per network device. Signed-off-by: Brian Phan --- overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww | 2 ++ 1 file changed, 2 insertions(+) diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww index dd6dba1f..1f0e5d79 100644 --- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww +++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww @@ -3,6 +3,8 @@ # Time: {{.BuildTime}} # Source: {{.BuildSource}} {{range $devname, $netdev := .NetDevs}} +{{- $filename := print "10-persistent-net.link-" $devname }} +{{- file $filename }} {{- if $netdev.Hwaddr }} [Match] MACAddress={{$netdev.Hwaddr}} From 59830dc549ceb546d74748f7a7ea0ed514648341 Mon Sep 17 00:00:00 2001 From: Brian Phan Date: Thu, 14 Dec 2023 09:32:21 -0800 Subject: [PATCH 2/7] Update file name of rendered file Signed-off-by: Brian Phan --- overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww index 1f0e5d79..6a073dc7 100644 --- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww +++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww @@ -3,7 +3,7 @@ # Time: {{.BuildTime}} # Source: {{.BuildSource}} {{range $devname, $netdev := .NetDevs}} -{{- $filename := print "10-persistent-net.link-" $devname }} +{{- $filename := print "10-persistent-net-" $devname ".link"}} {{- file $filename }} {{- if $netdev.Hwaddr }} [Match] From 55880ae37dfd8ddfe2b7ac227dd5da612ae07d86 Mon Sep 17 00:00:00 2001 From: Brian Phan Date: Thu, 14 Dec 2023 09:34:37 -0800 Subject: [PATCH 3/7] Update CHANGELOG Signed-off-by: Brian Phan --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70280717..e14206a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed bug where tags from profiles weren't rendered #967 - Fixed a bug when using `wwctl container import --force` to replace an existing container will generate an error #474 +- Create `/etc/systemd/network/10-persistent-net-.link` file per network device ### Changed From feeb6211afd67e0fccb9db0ab01e0ff3a0da7051 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 21 Dec 2023 22:11:44 -0700 Subject: [PATCH 4/7] Remove device: eth0 from dummy interface With eth0 specified as the default interface device, all interfaces by default were attempted to be renamed to eth0. This didn't break before because device renaming wasn't working for multiple interfaces in general; but now that it's fixed, we should no longer be setting a default interface name. Signed-off-by: Jonathon Anderson --- docs/man/man5/defaults.conf.5 | 1 - internal/pkg/node/constructors.go | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/man/man5/defaults.conf.5 b/docs/man/man5/defaults.conf.5 index 3488dc5d..3abe7257 100644 --- a/docs/man/man5/defaults.conf.5 +++ b/docs/man/man5/defaults.conf.5 @@ -30,7 +30,6 @@ defaultnode: - default network devices: dummy: - device: eth0 type: ethernet netmask: 255.255.255.0 .EE diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 08c27b19..fe7eb87a 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -35,7 +35,6 @@ defaultnode: - default network devices: dummy: - device: eth0 type: ethernet netmask: 255.255.255.0 onboot: true` From 07dbd5b2a729b04ce46a60757f6ec30eeb36802b Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 21 Dec 2023 23:09:20 -0700 Subject: [PATCH 5/7] Only set persistent-net name if device is specified persistent-net should not use the warewulf interface name as a default device name because the network configuration scripts don't. Signed-off-by: Jonathon Anderson --- .../wwinit/etc/systemd/network/10-persistent-net.link.ww | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww index 6a073dc7..159f74c2 100644 --- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww +++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww @@ -5,14 +5,10 @@ {{range $devname, $netdev := .NetDevs}} {{- $filename := print "10-persistent-net-" $devname ".link"}} {{- file $filename }} -{{- if $netdev.Hwaddr }} +{{- if and $netdev.Hwaddr $netdev.Device }} [Match] MACAddress={{$netdev.Hwaddr}} [Link] -{{ if $netdev.Device -}} Name={{ $netdev.Device }} -{{ else -}} -Name={{ $devname }} -{{ end -}} {{ end -}} {{end}} From b49e77011829e58792d2fbe61e0f9b7e4400a33e Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 21 Dec 2023 23:10:47 -0700 Subject: [PATCH 6/7] Specify persistent-net comment block per-file Signed-off-by: Jonathon Anderson --- .../wwinit/etc/systemd/network/10-persistent-net.link.ww | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww index 159f74c2..b116a029 100644 --- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww +++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww @@ -1,10 +1,10 @@ -# This file is autogenerated by warewulf -# Host: {{.BuildHost}} -# Time: {{.BuildTime}} -# Source: {{.BuildSource}} {{range $devname, $netdev := .NetDevs}} {{- $filename := print "10-persistent-net-" $devname ".link"}} {{- file $filename }} +# This file is autogenerated by warewulf +# Host: {{$.BuildHost}} +# Time: {{$.BuildTime}} +# Source: {{$.BuildSource}} {{- if and $netdev.Hwaddr $netdev.Device }} [Match] MACAddress={{$netdev.Hwaddr}} From a20f4bbcea64787eff028bac7d7c81b6542ff398 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 21 Dec 2023 23:11:34 -0700 Subject: [PATCH 7/7] Minor formatting fixes for persistent-net template Signed-off-by: Jonathon Anderson --- .../wwinit/etc/systemd/network/10-persistent-net.link.ww | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww index b116a029..fb84abd5 100644 --- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww +++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww @@ -1,5 +1,5 @@ -{{range $devname, $netdev := .NetDevs}} -{{- $filename := print "10-persistent-net-" $devname ".link"}} +{{ range $devname, $netdev := .NetDevs -}} +{{- $filename := print "10-persistent-net-" $devname ".link" }} {{- file $filename }} # This file is autogenerated by warewulf # Host: {{$.BuildHost}} @@ -11,4 +11,4 @@ MACAddress={{$netdev.Hwaddr}} [Link] Name={{ $netdev.Device }} {{ end -}} -{{end}} +{{ end -}}