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

Updates to overlay for NodeDB updates

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-11-26 19:16:55 -08:00
parent 942dd77323
commit dba9de2c8b
2 changed files with 205 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/pkg/overlay/funcmap.go
View File

@@ -21,15 +21,16 @@ func templateFileInclude(path string) string {
func templateVnfsFileInclude(vnfsname string, filepath string) string {
wwlog.Printf(wwlog.DEBUG, "Including VNFS file into template: %s: %s\n", vnfsname, filepath)
v, err := vnfs.Load(vnfsname)
if err != nil {
if vnfsname == "" {
wwlog.Printf(wwlog.WARN, "VNFS not set for template: %s\n", filepath)
return ""
}
v, _ := vnfs.Load(vnfsname)
vnfsDir := v.Chroot
if util.IsDir(vnfsDir) == false {
wwlog.Printf(wwlog.WARN, "Template requesting file from non-imported VNFS: %s (%s)\n", vnfsname, filepath)
wwlog.Printf(wwlog.WARN, "Template requires VNFS (%s) to be imported: %s\n", vnfsname, filepath)
return ""
}
wwlog.Printf(wwlog.DEBUG, "IncludeVnfs file from: %s/%s\n", vnfsDir, filepath)