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

Move tstruct.Overlay from wwctl to overlay.InitStruct

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-12-18 12:14:54 -07:00
committed by Christian Goll
parent c03dc9436b
commit 0b00233ab7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/app/wwctl/overlay/show/main.go
View File

@@ -57,12 +57,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
nodeConf = node.NewNode(hostName) nodeConf = node.NewNode(hostName)
nodeConf.ClusterName = hostName nodeConf.ClusterName = hostName
} }
tstruct, err := overlay.InitStruct(nodeConf) tstruct, err := overlay.InitStruct(overlayName, nodeConf)
if err != nil { if err != nil {
return err return err
} }
tstruct.BuildSource = overlayFile tstruct.BuildSource = overlayFile
tstruct.Overlay = overlayName
buffer, backupFile, writeFile, err := overlay.RenderTemplateFile(overlayFile, tstruct) buffer, backupFile, writeFile, err := overlay.RenderTemplateFile(overlayFile, tstruct)
if err != nil { if err != nil {
return err return err

2
internal/pkg/configure/hostfile.go
View File

@@ -21,7 +21,7 @@ func Hostfile() (err error) {
} }
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
tstruct, err := overlay.InitStruct(node.NewNode(hostname)) tstruct, err := overlay.InitStruct(overlay_.Name(), node.NewNode(hostname))
if err != nil { if err != nil {
return err return err
} }

3
internal/pkg/overlay/datastructure.go
View File

@@ -46,8 +46,9 @@ type TemplateStruct struct {
/* /*
Initialize an TemplateStruct with the given node.NodeInfo Initialize an TemplateStruct with the given node.NodeInfo
*/ */
func InitStruct(nodeData node.Node) (TemplateStruct, error) { func InitStruct(overlayName string, nodeData node.Node) (TemplateStruct, error) {
var tstruct TemplateStruct var tstruct TemplateStruct
tstruct.Overlay = overlayName
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
tstruct.BuildHost = hostname tstruct.BuildHost = hostname
controller := warewulfconf.Get() controller := warewulfconf.Get()

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

@@ -283,7 +283,7 @@ func BuildOverlayIndir(nodeData node.Node, overlayNames []string, outputDir stri
wwlog.Debug("Created directory in overlay: %s", location) wwlog.Debug("Created directory in overlay: %s", location)
} else if filepath.Ext(location) == ".ww" { } else if filepath.Ext(location) == ".ww" {
tstruct, err := InitStruct(nodeData) tstruct, err := InitStruct(overlayName, nodeData)
if err != nil { if err != nil {
return fmt.Errorf("failed to initial data for %s: %w", nodeData.Id(), err) return fmt.Errorf("failed to initial data for %s: %w", nodeData.Id(), err)
} }