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

Merge branch 'main' into node_status_monitor

Browse Source
This commit is contained in:
Gregory M. Kurtzer
2022-01-05 16:40:53 -08:00
committed by GitHub
parent 6afb3f3e25 8ea38b295c
commit 4a8542351f
69 changed files with 530 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/pkg/warewulfd/ipxe.go
View File

@@ -83,8 +83,7 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
unconfiguredNode = true
} else {
nodeobj = n
_ = overlay.BuildSystemOverlay([]node.NodeInfo{n})
_ = overlay.BuildRuntimeOverlay([]node.NodeInfo{n})
_ = overlay.BuildAllOverlays([]node.NodeInfo{n})
daemonLogf("IPXEREQ: %s (node automatically configured)\n", hwaddr)

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

@@ -5,7 +5,6 @@ import (
"strconv"
"strings"
"github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/util"
@@ -64,12 +63,12 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
}
if n.RuntimeOverlay.Defined() {
fileName := config.RuntimeOverlayImage(n.Id.Get())
fileName := overlay.OverlayImage(n.Id.Get(), n.RuntimeOverlay.Get())
if conf.Warewulf.AutobuildOverlays {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, node.ConfigFile) || util.PathIsNewer(fileName, config.RuntimeOverlaySource(n.RuntimeOverlay.Get())) {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, node.ConfigFile) || util.PathIsNewer(fileName, overlay.OverlaySourceDir(n.RuntimeOverlay.Get())) {
daemonLogf("BUILD: %15s: Runtime Overlay\n", n.Id.Get())
_ = overlay.BuildRuntimeOverlay([]node.NodeInfo{n})
_ = overlay.BuildOverlay(n, n.RuntimeOverlay.Get())
}
}

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

@@ -4,7 +4,6 @@ import (
"net/http"
"strings"
"github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/util"
@@ -27,12 +26,12 @@ func SystemOverlaySend(w http.ResponseWriter, req *http.Request) {
}
if n.SystemOverlay.Defined() {
fileName := config.SystemOverlayImage(n.Id.Get())
fileName := overlay.OverlayImage(n.Id.Get(), n.SystemOverlay.Get())
if conf.Warewulf.AutobuildOverlays {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, node.ConfigFile) || util.PathIsNewer(fileName, config.SystemOverlaySource(n.SystemOverlay.Get())) {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, node.ConfigFile) || util.PathIsNewer(fileName, overlay.OverlaySourceDir(n.SystemOverlay.Get())) {
daemonLogf("BUILD: %15s: System Overlay\n", n.Id.Get())
_ = overlay.BuildSystemOverlay([]node.NodeInfo{n})
_ = overlay.BuildOverlay(n, n.SystemOverlay.Get())
}
}