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

calling the overlay build functions direclty

Browse Source 
The warewulfd process called `wwctl build -O [system|runtime] node`
if autobuild was set. This created [system|runtime].img which isn't
supported with the build model. Calling now BuildOverlay directly

Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2023-08-16 16:49:10 +02:00
committed by Jonathon Anderson
parent 92b651d70a
commit e90616cafb
2 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/pkg/overlay/overlay.go
View File

@@ -19,26 +19,6 @@ import (
"github.com/pkg/errors"
)
/*
func BuildSystemOverlay(nodeList []node.NodeInfo) error {
return nil
}
func BuildRuntimeOverlay(nodeList []node.NodeInfo) error {
return nil
}
func FindSystemOverlays() ([]string, error) {
return findAllOverlays("system")
}
func FindRuntimeOverlays() ([]string, error) {
return findAllOverlays("runtime")
}
*/
/*
Build all overlays (runtime and generic) for a node
*/

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

@@ -1,9 +1,11 @@
package warewulfd
import (
"fmt"
"net/http"
"os"
"github.com/hpcng/warewulf/internal/pkg/node"
nodepkg "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/util"
@@ -61,21 +63,22 @@ func getOverlayFile(
}
if build {
wwlog.Serv("BUILD %15s, overlays %v", nodeId, stage_overlays)
args := []string{"overlay", "build"}
for _, overlayname := range stage_overlays {
args = append(args, "-O", overlayname)
nodeDB, errNested := node.New()
if err != nil {
return stage_file, errNested
}
args = append(args, nodeId)
out, err := util.RunWWCTL(args...)
myNode, errNested := nodeDB.FindAllNodes()
if err != nil {
return stage_file, errNested
}
myNode = node.FilterByName(myNode, []string{nodeId})
if len(myNode) != 1 {
return stage_file, fmt.Errorf("couldn't find node %s", nodeId)
}
err = overlay.BuildOverlay(myNode[0], context, stage_overlays)
if err != nil {
wwlog.Error("Failed to build overlay: %s, %s, %s\n%s",
nodeId, stage_overlays, stage_file, string(out))
nodeId, stage_overlays, stage_file, err)
}
}