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

reservre meomory for tempalte struct

Browse Source
This commit is contained in:
Christian Goll
2022-04-08 17:06:13 +02:00
parent 3bbddf4a8c
commit 38b166945a
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,8 @@ Build overlay for the host, so no argument needs to be given
*/ */
func BuildHostOverlay() error { func BuildHostOverlay() error {
var host node.NodeInfo var host node.NodeInfo
host.Kernel = new(node.KernelEntry)
host.Ipmi = new(node.IpmiEntry)
var idEntry node.Entry var idEntry node.Entry
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
wwlog.Printf(wwlog.INFO, "Building overlay for %s: host\n", hostname) wwlog.Printf(wwlog.INFO, "Building overlay for %s: host\n", hostname)
@@ -220,6 +222,8 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir
} }
wwlog.Printf(wwlog.VERBOSE, "Processing node/overlay: %s/%s\n", nodeInfo.Id.Get(), strings.Join(overlayNames, "-")) wwlog.Printf(wwlog.VERBOSE, "Processing node/overlay: %s/%s\n", nodeInfo.Id.Get(), strings.Join(overlayNames, "-"))
var tstruct TemplateStruct var tstruct TemplateStruct
tstruct.Kernel = new(node.KernelConf)
tstruct.Ipmi = new(node.IpmiConf)
tstruct.Id = nodeInfo.Id.Get() tstruct.Id = nodeInfo.Id.Get()
tstruct.Hostname = nodeInfo.Id.Get() tstruct.Hostname = nodeInfo.Id.Get()
tstruct.Id = nodeInfo.Id.Get() tstruct.Id = nodeInfo.Id.Get()

4
overlays/wwinit/etc/issue.ww
View File

@@ -1,7 +1,7 @@
Warewulf Node: {{.Id}} Warewulf Node: {{.Id}}
Container: {{.Container}} Container: {{.Container}}
Kernel: {{.KernelVersion}} Kernel: {{.Kernel.Version}}
Kernelargs: {{.KernelArgs}} Kernelargs: {{.Kernel.Args}}
Network: Network:
{{- range $devname, $netdev := .NetDevs}} {{- range $devname, $netdev := .NetDevs}}

12
overlays/wwinit/warewulf/config.ww
View File

@@ -2,9 +2,9 @@ WWCONTAINER={{$.Container}}
WWHOSTNAME={{$.Id}} WWHOSTNAME={{$.Id}}
WWROOT={{$.Root}} WWROOT={{$.Root}}
WWINIT={{$.Init}} WWINIT={{$.Init}}
WWIPMI_IPADDR="{{$.IpmiIpaddr}}" WWIPMI_IPADDR="{{$.Ipmi.Ipaddr}}"
WWIPMI_NETMASK="{{$.IpmiNetmask}}" WWIPMI_NETMASK="{{$.Ipmi.Netmask}}"
WWIPMI_GATEWAY="{{$.IpmiGateway}}" WWIPMI_GATEWAY="{{$.Ipmi.Gateway}}"
WWIPMI_USER="{{$.IpmiUserName}}" WWIPMI_USER="{{$.Ipmi.UserName}}"
WWIPMI_PASSWORD="{{$.IpmiPassword}}" WWIPMI_PASSWORD="{{$.Ipmi.Password}}"
WWIPMI_WRITE="{{$.IpmiWrite}}" WWIPMI_WRITE="{{$.Ipmi.Write}}"