forked from pool/warewulf4
Christian Goll
70b45730b3
highlights: * renamed container to images * "sprig" functions in overlays * support for yaml and json formatted output * completely re-designed kernel selection support * nested profiles * arbitrary node and profile data in new "resources" structure * moved NFS mount options to resources / fstab overlay * split overlays by function * split overlays, site vs distribution * replaced defaults.conf with settings on default profile * improved tabular output * parallel overlay build * improved networking functionality (static route, vlans, and bonds) * kernel arguments as a list * non-zero exit codes on wwctl errors * fixed argument parsing for wwctl image exec * Defined menu for ipxe boot * Re-order SSH key types to make ed25519 default. - The configuation files nodes.conf and warewulf.conf will be updated on upgrade and the unmodified configuration files will be saved as nodes.conf.4.5.x and warewulf.conf.4.5.x OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=99
22 lines
688 B
Diff
22 lines
688 B
Diff
diff --git a/internal/app/wwctl/configure/main.go b/internal/app/wwctl/configure/main.go
|
|
index c663dc71..fad8c4af 100644
|
|
--- a/internal/app/wwctl/configure/main.go
|
|
+++ b/internal/app/wwctl/configure/main.go
|
|
@@ -4,6 +4,7 @@ import (
|
|
"os"
|
|
|
|
"github.com/spf13/cobra"
|
|
+ warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
|
|
"github.com/warewulf/warewulf/internal/pkg/configure"
|
|
"github.com/warewulf/warewulf/internal/pkg/wwlog"
|
|
)
|
|
@@ -23,7 +24,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
|
|
os.Exit(1)
|
|
}
|
|
|
|
- err = configure.SSH()
|
|
+ err = configure.SSH(warewulfconf.Get().SSH.KeyTypes...)
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
os.Exit(1)
|