Merge branch 'issue56' of https://github.com/tcooper/warewulf into tcooper-issue56

internal/app/wwctl/node/delete/main.go

@@ -31,19 +31,22 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	}
 
 	if count > 0 {
-		q := fmt.Sprintf("Are you sure you want to delete %d nodes(s)", count)
-
-		prompt := promptui.Prompt{
-			Label:     q,
-			IsConfirm: true,
-		}
-
-		result, _ := prompt.Run()
-
-		if result == "y" || result == "yes" {
+		if SetYes == true {
 			nodeDB.Persist()
-		}
+		} else {
+			q := fmt.Sprintf("Are you sure you want to delete %d nodes(s)", count)
 
+			prompt := promptui.Prompt{
+				Label:     q,
+				IsConfirm: true,
+			}
+
+			result, _ := prompt.Run()
+
+			if result == "y" || result == "yes" {
+				nodeDB.Persist()
+			}
+		}
 	} else {
 		fmt.Printf("No nodes found\n")
 	}

internal/app/wwctl/node/delete/root.go

@@ -11,6 +11,7 @@ var (
 		RunE:    CobraRunE,
 		Aliases: []string{"rm", "del"},
 	}
+	SetYes            bool
 	SetForce      string
 	SetGroup      string
 	SetController string
@@ -20,6 +21,7 @@ func init() {
 	baseCmd.PersistentFlags().StringVarP(&SetForce, "force", "f", "", "Force node delete")
 	baseCmd.PersistentFlags().StringVarP(&SetGroup, "group", "g", "default", "Set group to delete nodes from")
 	baseCmd.PersistentFlags().StringVarP(&SetController, "controller", "c", "default", "Controller to add nodes to")
+	baseCmd.PersistentFlags().BoolVarP(&SetYes, "yes", "y", false, "Set 'yes' to all questions asked")
 
 }
 

internal/app/wwctl/node/set/main.go

@@ -296,6 +296,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	if len(nodes) > 0 {
 		if SetYes == true {
 			nodeDB.Persist()
+			warewulfd.DaemonReload()
 		} else {
 			q := fmt.Sprintf("Are you sure you want to modify %d nodes(s)", len(nodes))
 

internal/app/wwctl/profile/delete/main.go

@@ -48,19 +48,22 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	}
 
 	if count > 0 {
-		q := fmt.Sprintf("Are you sure you want to delete %d profile(s) (%d groups, %d nodes)", count, numGroups, numNodes)
-
-		prompt := promptui.Prompt{
-			Label:     q,
-			IsConfirm: true,
-		}
-
-		result, _ := prompt.Run()
-
-		if result == "y" || result == "yes" {
+		if SetYes == true {
 			nodeDB.Persist()
-		}
+		} else {
+			q := fmt.Sprintf("Are you sure you want to delete %d profile(s) (%d groups, %d nodes)", count, numGroups, numNodes)
 
+			prompt := promptui.Prompt{
+				Label:     q,
+				IsConfirm: true,
+			}
+
+			result, _ := prompt.Run()
+
+			if result == "y" || result == "yes" {
+				nodeDB.Persist()
+			}
+		}
 	} else {
 		wwlog.Printf(wwlog.INFO, "No groups found\n")
 	}

internal/app/wwctl/profile/delete/root.go

@@ -10,8 +10,13 @@ var (
 		RunE:  CobraRunE,
 		Args:  cobra.MinimumNArgs(1),
 	}
+	SetYes            bool
 )
 
+func init() {
+baseCmd.PersistentFlags().BoolVarP(&SetYes, "yes", "y", false, "Set 'yes' to all questions asked")
+}
+
 // GetRootCommand returns the root cobra.Command for the application.
 func GetCommand() *cobra.Command {
 	return baseCmd

internal/app/wwctl/profile/set/main.go

@@ -257,20 +257,24 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	}
 
 	if len(profiles) > 0 {
-		q := fmt.Sprintf("Are you sure you want to modify %d profile(s)", len(profiles))
-
-		prompt := promptui.Prompt{
-			Label:     q,
-			IsConfirm: true,
-		}
-
-		result, _ := prompt.Run()
-
-		if result == "y" || result == "yes" {
+		if SetYes == true {
 			nodeDB.Persist()
 			warewulfd.DaemonReload()
-		}
+		} else {
+			q := fmt.Sprintf("Are you sure you want to modify %d profile(s)", len(profiles))
 
+			prompt := promptui.Prompt{
+				Label:     q,
+				IsConfirm: true,
+			}
+
+			result, _ := prompt.Run()
+
+			if result == "y" || result == "yes" {
+				nodeDB.Persist()
+				warewulfd.DaemonReload()
+			}
+		}
 	} else {
 		fmt.Printf("No profiles found\n")
 	}

internal/app/wwctl/profile/set/root.go

@@ -11,6 +11,7 @@ var (
 		RunE:  CobraRunE,
 	}
 	SetAll            bool
+	SetYes            bool
 	SetForce          bool
 	SetComment        string
 	SetContainer      string
@@ -64,6 +65,7 @@ func init() {
 
 	baseCmd.PersistentFlags().BoolVarP(&SetAll, "all", "a", false, "Set all profiles")
 	baseCmd.PersistentFlags().BoolVarP(&SetForce, "force", "f", false, "Force configuration (even on error)")
+	baseCmd.PersistentFlags().BoolVarP(&SetYes, "yes", "y", false, "Set 'yes' to all questions asked")
 }
 
 // GetRootCommand returns the root cobra.Command for the application.