kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update status before sending data to iPXE/node

Browse Source
This commit is contained in:
Gregory Kurtzer
2022-02-09 20:11:25 +00:00
parent 7f9216bdd8
commit b80d41975a
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/pkg/warewulfd/container.go
View File

@@ -31,14 +31,14 @@ func ContainerSend(w http.ResponseWriter, req *http.Request) {
if node.ContainerName.Defined() {
containerImage := container.ImageFile(node.ContainerName.Get())
updateStatus(node.Id.Get(), "CONTAINER", node.ContainerName.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
err = sendFile(w, containerImage, node.Id.Get())
if err != nil {
daemonLogf("ERROR: %s\n", err)
w.WriteHeader(503)
}
updateStatus(node.Id.Get(), "CONTAINER", node.ContainerName.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
} else {
w.WriteHeader(503)
daemonLogf("WARNING: No Container set for node %s\n", node.Id.Get())

4
internal/pkg/warewulfd/kernel.go
View File

@@ -31,13 +31,13 @@ func KernelSend(w http.ResponseWriter, req *http.Request) {
if node.KernelVersion.Defined() {
fileName := kernel.KernelImage(node.KernelVersion.Get())
updateStatus(node.Id.Get(), "KERNEL", node.KernelVersion.Get(), strings.Split(req.RemoteAddr, ":")[0])
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
daemonLogf("ERROR: %s\n", err)
}
updateStatus(node.Id.Get(), "KERNEL", node.KernelVersion.Get(), strings.Split(req.RemoteAddr, ":")[0])
} else {
w.WriteHeader(503)
daemonLogf("WARNING: No 'kernel version' set for node %s\n", node.Id.Get())

4
internal/pkg/warewulfd/kmods.go
View File

@@ -31,13 +31,13 @@ func KmodsSend(w http.ResponseWriter, req *http.Request) {
if node.KernelVersion.Defined() {
fileName := kernel.KmodsImage(node.KernelVersion.Get())
updateStatus(node.Id.Get(), "KMODS_OVERLAY", node.KernelVersion.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
err := sendFile(w, fileName, node.Id.Get())
if err != nil {
daemonLogf("ERROR: %s\n", err)
}
updateStatus(node.Id.Get(), "KMODS_OVERLAY", node.KernelVersion.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
} else {
w.WriteHeader(503)
daemonLogf("WARNING: No 'kernel version' set for node %s\n", node.Id.Get())

4
internal/pkg/warewulfd/runtime.go
View File

@@ -49,6 +49,8 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
if node.RuntimeOverlay.Defined() {
fileName := overlay.OverlayImage(node.Id.Get(), node.RuntimeOverlay.Get())
updateStatus(node.Id.Get(), "RUNTIME_OVERLAY", node.RuntimeOverlay.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
if conf.Warewulf.AutobuildOverlays {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, nodepkg.ConfigFile) || util.PathIsNewer(fileName, overlay.OverlaySourceDir(node.RuntimeOverlay.Get())) {
daemonLogf("BUILD: %15s: Runtime Overlay\n", node.Id.Get())
@@ -61,8 +63,6 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
daemonLogf("ERROR: %s\n", err)
}
updateStatus(node.Id.Get(), "RUNTIME_OVERLAY", node.RuntimeOverlay.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
} else {
w.WriteHeader(503)
daemonLogf("WARNING: No 'runtime overlay' set for node %s\n", node.Id.Get())

4
internal/pkg/warewulfd/system.go
View File

@@ -41,6 +41,8 @@ func SystemOverlaySend(w http.ResponseWriter, req *http.Request) {
if node.SystemOverlay.Defined() {
fileName := overlay.OverlayImage(node.Id.Get(), node.SystemOverlay.Get())
updateStatus(node.Id.Get(), "SYSTEM_OVERLAY", node.SystemOverlay.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
if conf.Warewulf.AutobuildOverlays {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, nodepkg.ConfigFile) || util.PathIsNewer(fileName, overlay.OverlaySourceDir(node.SystemOverlay.Get())) {
daemonLogf("BUILD: %15s: System Overlay\n", node.Id.Get())
@@ -53,8 +55,6 @@ func SystemOverlaySend(w http.ResponseWriter, req *http.Request) {
daemonLogf("ERROR: %s\n", err)
}
updateStatus(node.Id.Get(), "SYSTEM_OVERLAY", node.SystemOverlay.Get()+".img", strings.Split(req.RemoteAddr, ":")[0])
} else {
w.WriteHeader(503)
daemonLogf("WARNING: No 'system system-overlay' set for node %s\n", node.Id.Get())