From 4b4234994caebf0142bab1b8a19b237ac8c09d9f Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 18 Oct 2024 00:31:19 -0400 Subject: [PATCH] Misc whitespace handling fixes Also fixes handling of mtu value in Debian networking. Signed-off-by: Jonathon Anderson --- internal/app/wwctl/node/set/main_test.go | 10 +++++----- .../internal/debian_interfaces_test.go | 4 ++-- overlays/debian.interfaces/internal/nodes.conf | 2 ++ .../rootfs/etc/network/interfaces.d/default.ww | 4 ++-- overlays/host/internal/host_test.go | 5 ++--- .../host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww | 15 ++++++--------- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/internal/app/wwctl/node/set/main_test.go b/internal/app/wwctl/node/set/main_test.go index 0c03c783..6d099a61 100644 --- a/internal/app/wwctl/node/set/main_test.go +++ b/internal/app/wwctl/node/set/main_test.go @@ -112,7 +112,7 @@ nodes: nodeprofiles: {} nodes: n01: - ipmi: + ipmi: write: "true" `} run_test(t, test) @@ -131,7 +131,7 @@ nodes: nodeprofiles: {} nodes: n01: - ipmi: + ipmi: write: "true" `} run_test(t, test) @@ -146,7 +146,7 @@ func Test_Unset_Ipmi_Write(t *testing.T) { nodeprofiles: {} nodes: n01: - ipmi: + ipmi: write: "true" `, outDb: `WW_INTERNAL: 43 @@ -165,7 +165,7 @@ func Test_Unset_Ipmi_Write_False(t *testing.T) { nodeprofiles: {} nodes: n01: - ipmi: + ipmi: write: "false" `, outDb: `WW_INTERNAL: 43 @@ -183,7 +183,7 @@ func Test_Ipmi_Hidden_False(t *testing.T) { inDB: `WW_INTERNAL: 43 nodeprofiles: default: - ipmi: + ipmi: write: "true" nodes: n01: diff --git a/overlays/debian.interfaces/internal/debian_interfaces_test.go b/overlays/debian.interfaces/internal/debian_interfaces_test.go index b2d70cb8..9f47c1d6 100644 --- a/overlays/debian.interfaces/internal/debian_interfaces_test.go +++ b/overlays/debian.interfaces/internal/debian_interfaces_test.go @@ -57,7 +57,7 @@ iface wwnet0 inet static address 192.168.3.21 netmask 255.255.255.0 gateway 192.168.3.1 - mtu + mtu 1500 backupFile: true writeFile: true Filename: secondary @@ -68,6 +68,6 @@ iface wwnet1 inet static address 192.168.3.22 netmask 255.255.255.0 gateway 192.168.3.1 - mtu + mtu 9000 up ifmetric wwnet1 30 ` diff --git a/overlays/debian.interfaces/internal/nodes.conf b/overlays/debian.interfaces/internal/nodes.conf index 406ce4b2..df4f7439 100644 --- a/overlays/debian.interfaces/internal/nodes.conf +++ b/overlays/debian.interfaces/internal/nodes.conf @@ -7,9 +7,11 @@ nodes: ipaddr: 192.168.3.21 netmask: 255.255.255.0 gateway: 192.168.3.1 + mtu: 1500 secondary: device: wwnet1 hwaddr: 9a:77:29:73:14:f1 ipaddr: 192.168.3.22 netmask: 255.255.255.0 gateway: 192.168.3.1 + mtu: 9000 diff --git a/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww b/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww index a968c1f1..a65ce140 100644 --- a/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww +++ b/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww @@ -9,7 +9,7 @@ allow-hotplug {{$netdev.Device}} iface {{$netdev.Device}} inet static address {{$netdev.Ipaddr}} netmask {{$netdev.Netmask}} - {{ if $netdev.Gateway }}gateway {{$netdev.Gateway}}{{end}} - mtu {{$netdev.MTU}} + {{ if $netdev.Gateway }}gateway {{$netdev.Gateway}}{{- end}} + {{ if $netdev.MTU }}mtu {{$netdev.MTU}}{{- end}} up ifmetric {{$netdev.Device}} 30 {{- end}} diff --git a/overlays/host/internal/host_test.go b/overlays/host/internal/host_test.go index 4d8589ec..eb1c16ea 100644 --- a/overlays/host/internal/host_test.go +++ b/overlays/host/internal/host_test.go @@ -268,9 +268,8 @@ dhcp-boot=tag:iPXE,"http://192.168.0.1:9873/ipxe/${mac:hexhyp}?assetkey=${asset} dhcp-no-override # define the the range dhcp-range=192.168.0.100,192.168.0.199,255.255.255.0,6h - -dhcp-host=e6:92:39:49:7b:03,set:warewulf,node1,192.168.3.21,infinite -dhcp-host=9a:77:29:73:14:f1,set:warewulf,node1,192.168.3.22,infinite +dhcp-host=e6:92:39:49:7b:03,set:warewulf,node1,192.168.3.21,infinite +dhcp-host=9a:77:29:73:14:f1,set:warewulf,node1,192.168.3.22,infinite dhcp-host=e6:92:39:49:7b:04,set:warewulf,node2,192.168.3.23,infinite ` diff --git a/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww b/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww index d8610406..93295daf 100644 --- a/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww +++ b/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww @@ -32,13 +32,10 @@ tftp-root={{ $.Tftp.TftpRoot }} {{- end }} # define the the range dhcp-range={{$.Dhcp.RangeStart}},{{$.Dhcp.RangeEnd}},{{$.Netmask}},6h -{{/* Add all the known hosts */}} -{{- range $node := $.AllNodes}} {{/* for each node */}} -{{- range $devname, $netdev := $node.NetDevs}} {{/* for each network device on the node */}} -{{- if $netdev.Ipaddr}} {{/* if we have an ip address on this network device */}} -{{- if $netdev.Hwaddr }} +{{ range $node := $.AllNodes -}} +{{ range $devname, $netdev := $node.NetDevs -}} +{{ if and $netdev.Ipaddr $netdev.Hwaddr -}} dhcp-host={{$netdev.Hwaddr}},set:warewulf,{{$node.Id}},{{$netdev.Ipaddr}},infinite -{{- end}}{{/* end if Hwaddr */}} -{{- end}}{{/* end if ip */}} -{{- end}}{{/* end for each network device */}} -{{- end}}{{/* end for each node */}} +{{- end }} +{{ end -}} +{{ end -}}