check the yaml direclty after unmarshalling
This commit is contained in:
@@ -2,6 +2,7 @@ package node
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path"
|
||||
"sort"
|
||||
@@ -71,6 +72,21 @@ func New() (NodeYaml, error) {
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
wwlog.Debug("Checking nodes for types")
|
||||
for nodeName, node := range ret.Nodes {
|
||||
err = node.Check()
|
||||
if err != nil {
|
||||
wwlog.Warn("node: %s parsing error: %s", nodeName, err)
|
||||
return ret, err
|
||||
}
|
||||
}
|
||||
for profileName, profile := range ret.NodeProfiles {
|
||||
err = profile.Check()
|
||||
if err != nil {
|
||||
wwlog.Warn("node: %s parsing error: %s", profileName, err)
|
||||
return ret, err
|
||||
}
|
||||
}
|
||||
|
||||
wwlog.Debug("Returning node object")
|
||||
cachedDB = ret
|
||||
@@ -165,6 +181,10 @@ func (config *NodeYaml) FindAllNodes() ([]NodeInfo, error) {
|
||||
node.Tags[keyname] = key
|
||||
delete(node.Keys, keyname)
|
||||
}
|
||||
err = node.Check()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("node: %s check error: %s", nodename, err)
|
||||
}
|
||||
n.SetFrom(node)
|
||||
// only now the netdevs start to exist so that default values can be set
|
||||
for _, netdev := range n.NetDevs {
|
||||
|
||||
Reference in New Issue
Block a user