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

make the configuration to be based in warewulf.conf

Browse Source 
defaults will be se by the Makefile

Signed-off-by: Christian Goll <cgoll@suse.de>
This commit is contained in:
Christian Goll
2023-03-03 16:02:41 +01:00
parent f2eff0f7b8
commit 4deae97bc8
18 changed files with 130 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import (
"sort"
"strings"
"github.com/hpcng/warewulf/internal/pkg/buildconfig"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"gopkg.in/yaml.v2"
@@ -37,11 +37,12 @@ defaultnode:
netmask: 255.255.255.0`
func init() {
conf := warewulfconf.New()
if ConfigFile == "" {
ConfigFile = path.Join(buildconfig.SYSCONFDIR(), "warewulf/nodes.conf")
ConfigFile = path.Join(conf.SYSCONFDIR(), "warewulf/nodes.conf")
}
if DefaultConfig == "" {
DefaultConfig = path.Join(buildconfig.SYSCONFDIR(), "warewulf/defaults.conf")
DefaultConfig = path.Join(conf.SYSCONFDIR(), "warewulf/defaults.conf")
}
}