From f3854e2ab458733e4d6b07bb0d4c5aaf7a1aeb68 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Wed, 9 Feb 2022 20:53:47 +0000 Subject: [PATCH 1/3] Give a 5 second buffer for all updates to come in. --- internal/app/wwctl/node/status/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/app/wwctl/node/status/main.go b/internal/app/wwctl/node/status/main.go index af872a4d..31ef1d18 100644 --- a/internal/app/wwctl/node/status/main.go +++ b/internal/app/wwctl/node/status/main.go @@ -149,7 +149,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } if rightnow-o.Lastseen >= int64(controller.Warewulf.UpdateInterval*2) { color.Red("%-20s %-20s %-25s %-10d\n", o.NodeName, o.Stage, o.Sent, rightnow-o.Lastseen) - } else if rightnow-o.Lastseen >= int64(controller.Warewulf.UpdateInterval) { + } else if rightnow-o.Lastseen >= int64(controller.Warewulf.UpdateInterval+5) { color.Yellow("%-20s %-20s %-25s %-10d\n", o.NodeName, o.Stage, o.Sent, rightnow-o.Lastseen) } else { fmt.Printf("%-20s %-20s %-25s %-10d\n", o.NodeName, o.Stage, o.Sent, rightnow-o.Lastseen) From 543609fdfc403120870346f77b89f26b630e3dcb Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Wed, 9 Feb 2022 20:54:07 +0000 Subject: [PATCH 2/3] Remove spaces from asset tag --- internal/app/wwclient/root.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go index 5578fb63..d25b0fc8 100644 --- a/internal/app/wwclient/root.go +++ b/internal/app/wwclient/root.go @@ -118,7 +118,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { sysinfoDump := smbiosDump.SystemInformation() localUUID, _ := sysinfoDump.UUID() x := smbiosDump.SystemEnclosure() - tag := x.AssetTagNumber() + tag := strings.ReplaceAll(x.AssetTagNumber(), " ", "_") cmdline, err := ioutil.ReadFile("/proc/cmdline") if err != nil { @@ -177,6 +177,7 @@ func updateSystem(ipaddr string, port int, wwid string, tag string, localUUID uu for { var err error getString := fmt.Sprintf("http://%s:%d/overlay-runtime/%s?assetkey=%s&uuid=%s", ipaddr, port, wwid, tag, localUUID) + wwlog.Printf(wwlog.DEBUG, "Making request: %s\n", getString) resp, err = Webclient.Get(getString) if err == nil { break From f6fb7fa807a5932693eac9ecd329b3c5ea3675f4 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Wed, 9 Feb 2022 23:05:32 +0000 Subject: [PATCH 3/3] Cleaned up provisioned /etc/issue.ww (less is sometimes more) --- overlays/wwinit/etc/issue.ww | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/overlays/wwinit/etc/issue.ww b/overlays/wwinit/etc/issue.ww index 9172e831..00463bf0 100644 --- a/overlays/wwinit/etc/issue.ww +++ b/overlays/wwinit/etc/issue.ww @@ -1,12 +1,11 @@ -Node: {{.Id}} -Container: {{.Container}} -Kernel: {{.KernelVersion}} -Kernelargs: {{.KernelArgs}} -wwinit overlay: {{.SystemOverlay}} -genric overlay: {{.RuntimeOverlay}} -{{if .IpmiIpaddr }}Ipmi: {{.IpmiIpaddr}} {{- end -}} -{{range $devname, $netdev := .NetDevs}} -{{$devname}}: {{$netdev.Device}} -{{$devname}}: {{$netdev.IpCIDR}} -{{$devname}}: {{$netdev.Hwaddr}} -{{- end}} +Warewulf Node: {{.Id}} +Container: {{.Container}} +Kernel: {{.KernelVersion}} +Kernelargs: {{.KernelArgs}} + +Network: +{{- range $devname, $netdev := .NetDevs}} + {{$devname}}: {{$netdev.Device}} + {{$devname}}: {{$netdev.IpCIDR}} + {{$devname}}: {{$netdev.Hwaddr}} +{{end}} \ No newline at end of file