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

Changed "key" paramaters to tags and cleaned up interface

Browse Source
This commit is contained in:
Gregory Kurtzer
2022-02-11 05:52:46 +00:00
parent 7381efb0fc
commit ffaf794a42
10 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ type TemplateStruct struct {
RuntimeOverlay string
SystemOverlay string
NetDevs map[string]*node.NetDevs
Keys map[string]string
Tags map[string]string
AllNodes []node.NodeInfo
NFSMounts []string
}
@@ -187,7 +187,7 @@ func BuildOverlay(nodeInfo node.NodeInfo, overlayName string) error {
tstruct.RuntimeOverlay = nodeInfo.RuntimeOverlay.Get()
tstruct.SystemOverlay = nodeInfo.SystemOverlay.Get()
tstruct.NetDevs = make(map[string]*node.NetDevs)
tstruct.Keys = make(map[string]string)
tstruct.Tags = make(map[string]string)
for devname, netdev := range nodeInfo.NetDevs {
var nd node.NetDevs
tstruct.NetDevs[devname] = &nd
@@ -208,8 +208,8 @@ func BuildOverlay(nodeInfo node.NodeInfo, overlayName string) error {
tstruct.NetDevs[devname].IpCIDR = netaddr.String()
}
for keyname, key := range nodeInfo.Keys {
tstruct.Keys[keyname] = key.Get()
for keyname, key := range nodeInfo.Tags {
tstruct.Tags[keyname] = key.Get()
}
tstruct.AllNodes = allNodes
for _, export := range controller.Nfs.ExportsExtended {