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

Use node.NewInfo constructor in configure hostfile

Browse Source 
Also used in overlay, as I was looking there already.

Signed-off-by: Jonathon Anderson <janderson@ciq.co>
This commit is contained in:
Jonathon Anderson
2022-11-11 10:45:14 -06:00
parent 037c456bc4
commit 15879eb991
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,10 +20,11 @@ func Hostfile() error {
wwlog.Error("'the overlay template '/etc/hosts.ww' does not exists in 'host' overlay") wwlog.Error("'the overlay template '/etc/hosts.ww' does not exists in 'host' overlay")
os.Exit(1) os.Exit(1)
} }
var nodeInfo node.NodeInfo
tstruct := overlay.InitStruct(nodeInfo) nodeInfo := node.NewInfo()
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
nodeInfo.Id.Set(hostname) nodeInfo.Id.Set(hostname)
tstruct := overlay.InitStruct(nodeInfo)
buffer, backupFile, writeFile, err := overlay.RenderTemplateFile( buffer, backupFile, writeFile, err := overlay.RenderTemplateFile(
hostTemplate, hostTemplate,
tstruct) tstruct)

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

@@ -81,14 +81,11 @@ func BuildSpecificOverlays(nodes []node.NodeInfo, overlayNames []string) error {
Build overlay for the host, so no argument needs to be given Build overlay for the host, so no argument needs to be given
*/ */
func BuildHostOverlay() error { func BuildHostOverlay() error {
var host node.NodeInfo host := node.NewInfo()
host.Kernel = new(node.KernelEntry)
host.Ipmi = new(node.IpmiEntry)
var idEntry node.Entry
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
host.Id.Set(hostname)
wwlog.Info("Building overlay for %s: host", hostname) wwlog.Info("Building overlay for %s: host", hostname)
idEntry.Set(hostname)
host.Id = idEntry
hostdir := OverlaySourceDir("host") hostdir := OverlaySourceDir("host")
stats, err := os.Stat(hostdir) stats, err := os.Stat(hostdir)
if err != nil { if err != nil {