Merge pull request #781 from anderbubble/config-refactor

Refactor package that handles warewulf.conf
2023-04-26 13:56:03 -06:00
parent 74df996550 62018eedf0
commit ab52e389f6
50 changed files with 552 additions and 380 deletions
--- a/internal/pkg/node/constructors.go
+++ b/internal/pkg/node/constructors.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"

-	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
+	warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"

 	"gopkg.in/yaml.v2"
@@ -41,7 +41,7 @@ defaultnode:
      onboot: true`

 func init() {
-	conf := warewulfconf.New()
+	conf := warewulfconf.Get()
 	if ConfigFile == "" {
 		ConfigFile = path.Join(conf.Paths.Sysconfdir, "warewulf/nodes.conf")
 	}