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

Reverse compatibility for keys to tags

Browse Source
This commit is contained in:
Gregory Kurtzer
2022-02-11 15:36:38 +00:00
parent ffaf794a42
commit 49150c172e
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/pkg/node/modifiers.go
View File

@@ -73,14 +73,11 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
config.Nodes[nodeID].SystemOverlay = node.SystemOverlay.GetReal()
config.Nodes[nodeID].Root = node.Root.GetReal()
config.Nodes[nodeID].AssetKey = node.AssetKey.GetReal()
config.Nodes[nodeID].Discoverable = node.Discoverable.GetReal()
config.Nodes[nodeID].Profiles = node.Profiles
config.Nodes[nodeID].NetDevs = make(map[string]*NetDevs)
config.Nodes[nodeID].Tags = make(map[string]string)
for devname, netdev := range node.NetDevs {
var newdev NetDevs
config.Nodes[nodeID].NetDevs[devname] = &newdev
@@ -95,8 +92,11 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
config.Nodes[nodeID].NetDevs[devname].Default = netdev.Default.GetReal()
}
config.Nodes[nodeID].Tags = make(map[string]string)
for keyname, key := range node.Tags {
config.Nodes[nodeID].Tags[keyname] = key.GetReal()
if key.GetReal() != "" {
config.Nodes[nodeID].Tags[keyname] = key.GetReal()
}
}
return nil
@@ -161,14 +161,11 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].SystemOverlay = profile.SystemOverlay.GetReal()
config.NodeProfiles[profileID].Root = profile.Root.GetReal()
config.NodeProfiles[profileID].AssetKey = profile.AssetKey.GetReal()
config.NodeProfiles[profileID].Discoverable = profile.Discoverable.GetReal()
config.NodeProfiles[profileID].Profiles = profile.Profiles
config.NodeProfiles[profileID].NetDevs = make(map[string]*NetDevs)
config.NodeProfiles[profileID].Tags = make(map[string]string)
for devname, netdev := range profile.NetDevs {
var newdev NetDevs
config.NodeProfiles[profileID].NetDevs[devname] = &newdev
@@ -183,6 +180,7 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].NetDevs[devname].Default = netdev.Default.GetReal()
}
config.NodeProfiles[profileID].Tags = make(map[string]string)
for keyname, key := range profile.Tags {
config.NodeProfiles[profileID].Tags[keyname] = key.GetReal()
}