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

28
internal/pkg/node/constructors.go
View File

@@ -50,7 +50,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
wwlog.Printf(wwlog.DEBUG, "In node loop: %s\n", nodename)
n.NetDevs = make(map[string]*NetDevEntry)
n.Keys = make(map[string]*Entry)
n.Tags = make(map[string]*Entry)
n.SystemOverlay.SetDefault("wwinit")
n.RuntimeOverlay.SetDefault("generic")
n.Ipxe.SetDefault("default")
@@ -107,12 +107,12 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.NetDevs[devname].Default.Set(netdev.Default)
}
for keyname, key := range node.Keys {
if _, ok := n.Keys[keyname]; !ok {
for keyname, key := range node.Tags {
if _, ok := n.Tags[keyname]; !ok {
var key Entry
n.Keys[keyname] = &key
n.Tags[keyname] = &key
}
n.Keys[keyname].Set(key)
n.Tags[keyname].Set(key)
}
for _, p := range n.Profiles {
@@ -161,12 +161,12 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.NetDevs[devname].Default.SetAlt(netdev.Default, p)
}
for keyname, key := range config.NodeProfiles[p].Keys {
if _, ok := n.Keys[keyname]; !ok {
for keyname, key := range config.NodeProfiles[p].Tags {
if _, ok := n.Tags[keyname]; !ok {
var key Entry
n.Keys[keyname] = &key
n.Tags[keyname] = &key
}
n.Keys[keyname].SetAlt(key, p)
n.Tags[keyname].SetAlt(key, p)
}
}
@@ -194,7 +194,7 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
for name, profile := range config.NodeProfiles {
var p NodeInfo
p.NetDevs = make(map[string]*NetDevEntry)
p.Keys = make(map[string]*Entry)
p.Tags = make(map[string]*Entry)
p.Id.Set(name)
p.Comment.Set(profile.Comment)
@@ -235,12 +235,12 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
p.NetDevs[devname].Default.Set(netdev.Default)
}
for keyname, key := range profile.Keys {
if _, ok := p.Keys[keyname]; !ok {
for keyname, key := range profile.Tags {
if _, ok := p.Tags[keyname]; !ok {
var key Entry
p.Keys[keyname] = &key
p.Tags[keyname] = &key
}
p.Keys[keyname].Set(key)
p.Tags[keyname].Set(key)
}
// TODO: Validate or die on all inputs

4
internal/pkg/node/datastructure.go
View File

@@ -36,7 +36,7 @@ type NodeConf struct {
Discoverable string `yaml:"discoverable,omitempty"`
Profiles []string `yaml:"profiles,omitempty"`
NetDevs map[string]*NetDevs `yaml:"network devices,omitempty"`
Keys map[string]string `yaml:"keys,omitempty"`
Tags map[string]string `yaml:"tags,omitempty"`
}
type NetDevs struct {
@@ -88,7 +88,7 @@ type NodeInfo struct {
Profiles []string
GroupProfiles []string
NetDevs map[string]*NetDevEntry
Keys map[string]*Entry
Tags map[string]*Entry
}
type NetDevEntry struct {

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

@@ -79,7 +79,7 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
config.Nodes[nodeID].Profiles = node.Profiles
config.Nodes[nodeID].NetDevs = make(map[string]*NetDevs)
config.Nodes[nodeID].Keys = make(map[string]string)
config.Nodes[nodeID].Tags = make(map[string]string)
for devname, netdev := range node.NetDevs {
var newdev NetDevs
@@ -95,8 +95,8 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
config.Nodes[nodeID].NetDevs[devname].Default = netdev.Default.GetReal()
}
for keyname, key := range node.Keys {
config.Nodes[nodeID].Keys[keyname] = key.GetReal()
for keyname, key := range node.Tags {
config.Nodes[nodeID].Tags[keyname] = key.GetReal()
}
return nil
@@ -167,7 +167,7 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].Profiles = profile.Profiles
config.NodeProfiles[profileID].NetDevs = make(map[string]*NetDevs)
config.NodeProfiles[profileID].Keys = make(map[string]string)
config.NodeProfiles[profileID].Tags = make(map[string]string)
for devname, netdev := range profile.NetDevs {
var newdev NetDevs
@@ -183,8 +183,8 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].NetDevs[devname].Default = netdev.Default.GetReal()
}
for keyname, key := range profile.Keys {
config.NodeProfiles[profileID].Keys[keyname] = key.GetReal()
for keyname, key := range profile.Tags {
config.NodeProfiles[profileID].Tags[keyname] = key.GetReal()
}
return nil

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 {