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

Updates to rebase 1/10

Browse Source 
Signed-off-by: jcsiadal <jeremy.c.siadal@intel.com>
This commit is contained in:
jcsiadal
2022-01-11 07:02:41 +00:00
parent 7cf6b7155c
commit 8afe4b1342
5 changed files with 15 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/app/wwctl/configure/nfs/main.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/pkg/errors"
"github.com/spf13/cobra"

12
internal/app/wwctl/node/ready/main.go
View File

@@ -81,18 +81,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
wwlog.Printf(wwlog.VERBOSE, "System Overlay not defined: %s\n", node.Id.Get())
}
if node.RuntimeOverlay.Get() != "" {
if util.IsFile(overlay.RuntimeOverlayImage(node.Id.Get())) {
runtimeo_good = true
} else {
status = false
wwlog.Printf(wwlog.VERBOSE, "Runtime Overlay not found: %s\n", overlay.RuntimeOverlaySource(node.Id.Get()))
}
} else {
status = false
wwlog.Printf(wwlog.VERBOSE, "Runtime Overlay not defined: %s\n", node.Id.Get())
}
fmt.Printf("%-25s %-10t %-6t %-6t %-6t %-6t %-6t\n", node.Id.Get(), status, vnfs_good, kernel_good, kmods_good, systemo_good, runtimeo_good)
}

24
internal/app/wwctl/overlay/list/main.go
View File

@@ -31,25 +31,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
fmt.Printf("%-30s %-12s\n", "OVERLAY NAME", "FILES/DIRS")
}
<<<<<<< HEAD
for o := range overlays {
name := overlays[o]
path := overlay.OverlaySourceDir(name)
=======
for o := range overlayList {
var path string
name := overlayList[o]
if overlayName != "" && overlayName != name {
continue
}
if overlayKind == "system" {
path = overlay.SystemOverlaySource(overlayList[o])
} else if overlayKind == "runtime" {
path = overlay.RuntimeOverlaySource(overlayList[o])
}
>>>>>>> eb32d41... Add config option for shared state dir
if util.IsDir(path) {
files := util.FindFiles(path)
@@ -76,11 +60,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
sys := s.Sys()
<<<<<<< HEAD
fmt.Printf("%v %5d %-5d %-18s /%s\n", perms, sys.(*syscall.Stat_t).Uid, sys.(*syscall.Stat_t).Gid, overlays[o], files[file])
=======
fmt.Printf("%v %5d %-5d %-18s /%s\n", perms, sys.(*syscall.Stat_t).Uid, sys.(*syscall.Stat_t).Gid, overlayList[o], files[file])
>>>>>>> eb32d41... Add config option for shared state dir
}
} else {
@@ -88,11 +68,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
} else {
<<<<<<< HEAD
wwlog.Printf(wwlog.ERROR, "system/%s (path not found:%s)\n", overlays[o], path)
=======
wwlog.Printf(wwlog.ERROR, "system/%s (path not found:%s)\n", overlayList[o], path)
>>>>>>> eb32d41... Add config option for shared state dir
}
}

23
internal/pkg/overlay/config.go
View File

@@ -3,21 +3,28 @@ package overlay
import (
"path"
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/hpcng/warewulf/internal/pkg/util"
)
func OverlayDir() string {
return path.Join(warewulfconf.DataStore(), "/overlays")
func OverlaySourceTopDir() string {
return path.Join(warewulfconf.DataStore(), "overlays/")
}
func OverlaySourceDir(overlayName string) string {
return path.Join(OverlaySourceTopDir(), overlayName)
}
func OverlayImage(nodeName string, overlayName string) string {
return path.Join(warewulfconf.DataStore(), "/provision/overlays/", nodeName, overlayName + ".img")
}
func SystemOverlayDir() string {
return path.Join(OverlayDir(), "/system")
return path.Join(OverlaySourceTopDir(), "/system")
}
func RuntimeOverlayDir() string {
return path.Join(OverlayDir(), "/runtime")
return path.Join(OverlaySourceTopDir(), "/runtime")
}
func SystemOverlaySource(overlayName string) string {
@@ -59,7 +66,7 @@ func SystemOverlayImage(nodeName string) string {
return ""
}
return path.Join(SystemOverlayDir(), nodeName+".img")
return path.Join(warewulfconf.DataStore(), "/provision/overlays/runtime/", nodeName + ".img")
}
func RuntimeOverlayImage(nodeName string) string {
@@ -73,5 +80,5 @@ func RuntimeOverlayImage(nodeName string) string {
return ""
}
return path.Join(RuntimeOverlayDir(), nodeName+".img")
return path.Join(warewulfconf.DataStore(), "/provision/overlays/system/", nodeName + ".img")
}

12
internal/pkg/overlay/overlay.go
View File

@@ -57,18 +57,6 @@ func FindRuntimeOverlays() ([]string, error) {
}
*/
func OverlaySourceTopDir() string {
return path.Join(config.LocalStateDir, "overlays/")
}
func OverlaySourceDir(overlayName string) string {
return path.Join(OverlaySourceTopDir(), overlayName)
}
func OverlayImage(nodename string, overlayname string) string {
return fmt.Sprintf("%s/provision/overlays/%s/%s.img", config.LocalStateDir, nodename, overlayname)
}
func BuildAllOverlays(nodes []node.NodeInfo) error {
for _, n := range nodes {
var overlays []string