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

Refactor node

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-10-25 14:17:00 -06:00
parent e6f5c63c21
commit 0665d5dc88
35 changed files with 112 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/pkg/warewulfd/nodedb.go
View File

@@ -53,7 +53,7 @@ func loadNodeDB() (err error) {
return nil
}
func GetNodeOrSetDiscoverable(hwaddr string) (node.NodeConf, error) {
func GetNodeOrSetDiscoverable(hwaddr string) (node.Node, error) {
db.lock.RLock()
defer db.lock.RUnlock()
// NOTE: since discoverable nodes will write an updated DB to file and then

2
internal/pkg/warewulfd/provision.go
View File

@@ -35,7 +35,7 @@ type templateVars struct {
KernelArgs string
KernelOverride string
Tags map[string]string
NetDevs map[string]*node.NetDevs
NetDevs map[string]*node.NetDev
}
func ProvisionSend(w http.ResponseWriter, req *http.Request) {

6
internal/pkg/warewulfd/util.go
View File

@@ -44,7 +44,7 @@ func sendFile(
return nil
}
func getOverlayFile(n node.NodeConf, context string, stage_overlays []string, autobuild bool) (stage_file string, err error) {
func getOverlayFile(n node.Node, context string, stage_overlays []string, autobuild bool) (stage_file string, err error) {
stage_file = overlay.OverlayImage(n.Id(), context, stage_overlays)
err = nil
@@ -60,9 +60,9 @@ func getOverlayFile(n node.NodeConf, context string, stage_overlays []string, au
if build {
if len(stage_overlays) > 0 {
err = overlay.BuildSpecificOverlays([]node.NodeConf{n}, stage_overlays)
err = overlay.BuildSpecificOverlays([]node.Node{n}, stage_overlays)
} else {
err = overlay.BuildAllOverlays([]node.NodeConf{n})
err = overlay.BuildAllOverlays([]node.Node{n})
}
if err != nil {
wwlog.Error("Failed to build overlay: %s, %s, %s\n%s",