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
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
diff --git a/etc/grub/grub.cfg.ww b/etc/grub/grub.cfg.ww
|
|
index f7ecac23..859d2d51 100644
|
|
--- a/etc/grub/grub.cfg.ww
|
|
+++ b/etc/grub/grub.cfg.ww
|
|
@@ -1,3 +1,4 @@
|
|
+{{ if .ContainerName }}
|
|
echo "================================================================================"
|
|
echo "Warewulf v4 now http booting grub: {{.Fqdn}} ({{.Hwaddr}})"
|
|
echo "================================================================================"
|
|
@@ -89,3 +90,12 @@ menuentry "System shutdown" {
|
|
echo "System shutting down..."
|
|
halt
|
|
}
|
|
+{{ else }}
|
|
+echo "================================================================================"
|
|
+echo " Warewulf v4:"
|
|
+echo " No node image/container defined for this node ({{.Fqdn}})."
|
|
+echo " Rebooting in 30s."
|
|
+echo "================================================================================"
|
|
+sleep 30
|
|
+reboot
|
|
+{{ end }}
|
|
diff --git a/etc/ipxe/default.ipxe b/etc/ipxe/default.ipxe
|
|
index 7db56e27..dbe10ed7 100644
|
|
--- a/etc/ipxe/default.ipxe
|
|
+++ b/etc/ipxe/default.ipxe
|
|
@@ -1,5 +1,5 @@
|
|
#!ipxe
|
|
-
|
|
+{{ if .ContainerName }}
|
|
echo
|
|
echo ================================================================================
|
|
echo Warewulf v4 now booting: {{.Fqdn}} ({{.Hwaddr}})
|
|
@@ -106,3 +106,12 @@ echo There was an error, rebooting in 15s...
|
|
echo
|
|
sleep 15
|
|
reboot
|
|
+{{ else }}
|
|
+echo ================================================================================
|
|
+echo Warewulf v4:
|
|
+echo No node image/container defined for this node ({{.Fqdn}}).
|
|
+echo Rebooting in 30s.
|
|
+echo ================================================================================
|
|
+sleep 30
|
|
+reboot
|
|
+{{ end }}
|
|
diff --git a/etc/ipxe/dracut.ipxe b/etc/ipxe/dracut.ipxe
|
|
index 4336b01e..7ae3b77e 100644
|
|
--- a/etc/ipxe/dracut.ipxe
|
|
+++ b/etc/ipxe/dracut.ipxe
|
|
@@ -1,5 +1,5 @@
|
|
#!ipxe
|
|
-
|
|
+{{ if .ContainerName }}
|
|
echo
|
|
echo ================================================================================
|
|
echo Warewulf v4 now booting via dracut: {{.Fqdn}} ({{.Hwaddr}})
|
|
@@ -44,3 +44,12 @@ echo There was an error, rebooting in 15s...
|
|
echo
|
|
sleep 15
|
|
reboot
|
|
+{{ else }}
|
|
+echo ================================================================================
|
|
+echo Warewulf v4:
|
|
+echo No node image/container defined for this node ({{.Fqdn}}).
|
|
+echo Rebooting in 30s.
|
|
+echo ================================================================================
|
|
+sleep 30
|
|
+reboot
|
|
+{{ end }}
|
|
\ No newline at end of file
|