From 4ba0cb7bcde591c8a0da68539a45eb6833c734dd Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 26 Nov 2020 19:18:13 -0800 Subject: [PATCH] Updates to vnfs command for NodeDB updates --- internal/app/wwctl/vnfs/build/main.go | 8 ++++++-- internal/app/wwctl/vnfs/list/main.go | 2 +- internal/app/wwctl/vnfs/list/root.go | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/internal/app/wwctl/vnfs/build/main.go b/internal/app/wwctl/vnfs/build/main.go index 8fbd1539..4b48fc09 100644 --- a/internal/app/wwctl/vnfs/build/main.go +++ b/internal/app/wwctl/vnfs/build/main.go @@ -28,7 +28,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } for _, node := range nodes { - set[node.Vnfs.String()] ++ + if node.Vnfs.Defined() == true { + set[node.Vnfs.Get()] ++ + } } } else if BuildAll == true { @@ -40,7 +42,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } for _, node := range nodes { - set[node.Vnfs.String()] ++ + if node.Vnfs.Defined() == true { + set[node.Vnfs.Get()] ++ + } } } else if len(args) == 1 { diff --git a/internal/app/wwctl/vnfs/list/main.go b/internal/app/wwctl/vnfs/list/main.go index 2fa015a5..85bf6296 100644 --- a/internal/app/wwctl/vnfs/list/main.go +++ b/internal/app/wwctl/vnfs/list/main.go @@ -20,7 +20,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { nodemap := make(map[string]int) for _, n := range nodes { - nodemap[n.Vnfs.String()] ++ + nodemap[n.Vnfs.Get()] ++ } images, _ := ioutil.ReadDir(config.VnfsImageParentDir()) diff --git a/internal/app/wwctl/vnfs/list/root.go b/internal/app/wwctl/vnfs/list/root.go index 42ce77dc..58662f4d 100644 --- a/internal/app/wwctl/vnfs/list/root.go +++ b/internal/app/wwctl/vnfs/list/root.go @@ -14,8 +14,8 @@ var ( ) func init() { - baseCmd.PersistentFlags().BoolVarP(&SystemOverlay, "system", "s", false, "Show System Overlays as well") - baseCmd.PersistentFlags().BoolVarP(&BuildAll, "all", "a", false, "Build all overlays (runtime and system)") + //baseCmd.PersistentFlags().BoolVarP(&SystemOverlay, "system", "s", false, "Show System Overlays as well") + //baseCmd.PersistentFlags().BoolVarP(&BuildAll, "all", "a", false, "Build all overlays (runtime and system)") }