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

Updates around VNFS restructure and kernel restructure. More coming.

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-05 16:43:30 -08:00
parent 4efb27a82f
commit 0095b55624
28 changed files with 791 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
internal/pkg/config/config.go
View File

@@ -11,10 +11,6 @@ const (
LocalStateDir = "/var/warewulf"
)
func NodeConfig() string {
return fmt.Sprintf("%s/nodes.conf", LocalStateDir)
}
func OverlayDir() string {
return fmt.Sprintf("%s/overlays/", LocalStateDir)
}
@@ -27,25 +23,13 @@ func RuntimeOverlayDir() string {
return path.Join(OverlayDir(), "/runtime")
}
func VnfsImageParentDir() string {
return fmt.Sprintf("%s/provision/vnfs/", LocalStateDir)
}
func VnfsChrootParentDir() string {
return fmt.Sprintf("%s/chroot/", LocalStateDir)
}
func KernelParentDir() string {
return fmt.Sprintf("%s/provision/kernel/", LocalStateDir)
}
func SystemOverlaySource(overlayName string) string {
if overlayName == "" {
wwlog.Printf(wwlog.ERROR, "System overlay name is not defined\n")
return ""
}
if util.TaintCheck(overlayName, "^[a-zA-Z0-9-._]+$") == false {
if util.ValidString(overlayName, "^[a-zA-Z0-9-._]+$") == false {
wwlog.Printf(wwlog.ERROR, "System overlay name contains illegal characters: %s\n", overlayName)
return ""
}
@@ -59,7 +43,7 @@ func RuntimeOverlaySource(overlayName string) string {
return ""
}
if util.TaintCheck(overlayName, "^[a-zA-Z0-9-._]+$") == false {
if util.ValidString(overlayName, "^[a-zA-Z0-9-._]+$") == false {
wwlog.Printf(wwlog.ERROR, "Runtime overlay name contains illegal characters: %s\n", overlayName)
return ""
}
@@ -67,41 +51,13 @@ func RuntimeOverlaySource(overlayName string) string {
return path.Join(RuntimeOverlayDir(), overlayName)
}
func KernelImage(kernelVersion string) string {
if kernelVersion == "" {
wwlog.Printf(wwlog.ERROR, "Kernel Version is not defined\n")
return ""
}
if util.TaintCheck(kernelVersion, "^[a-zA-Z0-9-._]+$") == false {
wwlog.Printf(wwlog.ERROR, "Runtime overlay name contains illegal characters: %s\n", kernelVersion)
return ""
}
return path.Join(KernelParentDir(), kernelVersion, "vmlinuz")
}
func KmodsImage(kernelVersion string) string {
if kernelVersion == "" {
wwlog.Printf(wwlog.ERROR, "Kernel Version is not defined\n")
return ""
}
if util.TaintCheck(kernelVersion, "^[a-zA-Z0-9-._]+$") == false {
wwlog.Printf(wwlog.ERROR, "Runtime overlay name contains illegal characters: %s\n", kernelVersion)
return ""
}
return path.Join(KernelParentDir(), kernelVersion, "kmods.img")
}
func SystemOverlayImage(nodeName string) string {
if nodeName == "" {
wwlog.Printf(wwlog.ERROR, "Node name is not defined\n")
return ""
}
if util.TaintCheck(nodeName, "^[a-zA-Z0-9-._:]+$") == false {
if util.ValidString(nodeName, "^[a-zA-Z0-9-._:]+$") == false {
wwlog.Printf(wwlog.ERROR, "System overlay name contains illegal characters: %s\n", nodeName)
return ""
}
@@ -115,42 +71,10 @@ func RuntimeOverlayImage(nodeName string) string {
return ""
}
if util.TaintCheck(nodeName, "^[a-zA-Z0-9-._:]+$") == false {
if util.ValidString(nodeName, "^[a-zA-Z0-9-._:]+$") == false {
wwlog.Printf(wwlog.ERROR, "System overlay name contains illegal characters: %s\n", nodeName)
return ""
}
return fmt.Sprintf("%s/provision/overlays/runtime/%s.img", LocalStateDir, nodeName)
}
func VnfsImageDir(uri string) string {
if uri == "" {
wwlog.Printf(wwlog.ERROR, "VNFS URI is not defined\n")
return ""
}
if util.TaintCheck(uri, "^[a-zA-Z0-9-._:]+$") == false {
wwlog.Printf(wwlog.ERROR, "VNFS name contains illegal characters: %s\n", uri)
return ""
}
return path.Join(VnfsImageParentDir(), uri)
}
func VnfsImage(uri string) string {
return path.Join(VnfsImageDir(uri), "image")
}
func VnfsChroot(uri string) string {
if uri == "" {
wwlog.Printf(wwlog.ERROR, "VNFS name is not defined\n")
return ""
}
if util.TaintCheck(uri, "^[a-zA-Z0-9-._:]+$") == false {
wwlog.Printf(wwlog.ERROR, "VNFS name contains illegal characters: %s\n", uri)
return ""
}
return path.Join(VnfsChrootParentDir(), uri)
}