Additional overlays to support provision-to-disk without ignition
- sfdisk - partitions the disk - mkfs - formats partitions - mkswap - formats partitions for swap - systemd.mount - explicit creation of systemd mount units - systemd.swap - explicit creation of systemd swap units Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
314
overlays/mkswap/internal/mkswap_test.go
Normal file
314
overlays/mkswap/internal/mkswap_test.go
Normal file
@@ -0,0 +1,314 @@
|
||||
package mkswap
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/warewulf/warewulf/internal/app/wwctl/overlay/show"
|
||||
"github.com/warewulf/warewulf/internal/pkg/testenv"
|
||||
"github.com/warewulf/warewulf/internal/pkg/wwlog"
|
||||
)
|
||||
|
||||
func Test_mkswapOverlay(t *testing.T) {
|
||||
tests := map[string]struct {
|
||||
args []string
|
||||
nodesConf string
|
||||
output string
|
||||
}{
|
||||
"mkswap:20-mkswap.sh.ww (empty)": {
|
||||
args: []string{"--quiet=true", "--render=node1", "mkswap", "warewulf/wwinit.d/20-mkswap.sh.ww"},
|
||||
nodesConf: `
|
||||
nodes:
|
||||
node1: {}`,
|
||||
output: `#!/bin/sh
|
||||
|
||||
PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
if ! command -v info >/dev/null; then
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
}
|
||||
fi
|
||||
|
||||
if ! command -v die >/dev/null; then
|
||||
die() {
|
||||
printf '%s\n' "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
already_formatted() {
|
||||
if ! command -v wipefs >/dev/null ; then
|
||||
info "warewulf: wipefs not found, cannot check if device is already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if wipefs -n "${1}" &>/dev/null; then
|
||||
info "warewulf: ${1} already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
if command -v mkswap >/dev/null; then :
|
||||
else
|
||||
info "warewulf: mkswap not found"
|
||||
fi
|
||||
`,
|
||||
},
|
||||
|
||||
"mkswap:20-mkswap.sh.ww (resource)": {
|
||||
args: []string{"--quiet=true", "--render=node1", "mkswap", "warewulf/wwinit.d/20-mkswap.sh.ww"},
|
||||
nodesConf: `
|
||||
nodes:
|
||||
node1:
|
||||
resources:
|
||||
mkswap:
|
||||
- device: /dev/disk/by-partlabel/swap`,
|
||||
output: `#!/bin/sh
|
||||
|
||||
PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
if ! command -v info >/dev/null; then
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
}
|
||||
fi
|
||||
|
||||
if ! command -v die >/dev/null; then
|
||||
die() {
|
||||
printf '%s\n' "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
already_formatted() {
|
||||
if ! command -v wipefs >/dev/null ; then
|
||||
info "warewulf: wipefs not found, cannot check if device is already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if wipefs -n "${1}" &>/dev/null; then
|
||||
info "warewulf: ${1} already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
if command -v mkswap >/dev/null; then :
|
||||
if false || ! already_formatted /dev/disk/by-partlabel/swap; then
|
||||
info "warewulf: mkswap: formatting /dev/disk/by-partlabel/swap"
|
||||
mkswap /dev/disk/by-partlabel/swap || die "warewulf: mkswap: failed to format /dev/disk/by-partlabel/swap"
|
||||
else
|
||||
info "warewulf: mkswap: skipping /dev/disk/by-partlabel/swap"
|
||||
continue
|
||||
fi
|
||||
else
|
||||
info "warewulf: mkswap not found"
|
||||
fi
|
||||
`,
|
||||
},
|
||||
|
||||
"mkswap:20-mkswap.sh.ww (resource overwrite)": {
|
||||
args: []string{"--quiet=true", "--render=node1", "mkswap", "warewulf/wwinit.d/20-mkswap.sh.ww"},
|
||||
nodesConf: `
|
||||
nodes:
|
||||
node1:
|
||||
resources:
|
||||
mkswap:
|
||||
- device: /dev/disk/by-partlabel/swap
|
||||
overwrite: true`,
|
||||
output: `#!/bin/sh
|
||||
|
||||
PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
if ! command -v info >/dev/null; then
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
}
|
||||
fi
|
||||
|
||||
if ! command -v die >/dev/null; then
|
||||
die() {
|
||||
printf '%s\n' "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
already_formatted() {
|
||||
if ! command -v wipefs >/dev/null ; then
|
||||
info "warewulf: wipefs not found, cannot check if device is already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if wipefs -n "${1}" &>/dev/null; then
|
||||
info "warewulf: ${1} already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
if command -v mkswap >/dev/null; then :
|
||||
if true || ! already_formatted /dev/disk/by-partlabel/swap; then
|
||||
info "warewulf: mkswap: formatting /dev/disk/by-partlabel/swap"
|
||||
mkswap /dev/disk/by-partlabel/swap || die "warewulf: mkswap: failed to format /dev/disk/by-partlabel/swap"
|
||||
else
|
||||
info "warewulf: mkswap: skipping /dev/disk/by-partlabel/swap"
|
||||
continue
|
||||
fi
|
||||
else
|
||||
info "warewulf: mkswap not found"
|
||||
fi
|
||||
`,
|
||||
},
|
||||
|
||||
"mkswap:20-mkswap.sh.ww (native)": {
|
||||
args: []string{"--quiet=true", "--render=node1", "mkswap", "warewulf/wwinit.d/20-mkswap.sh.ww"},
|
||||
nodesConf: `
|
||||
nodes:
|
||||
node1:
|
||||
filesystems:
|
||||
/dev/disk/by-partlabel/rootfs:
|
||||
format: ext4
|
||||
path: /
|
||||
/dev/disk/by-partlabel/scratch:
|
||||
format: ext4
|
||||
path: /scratch
|
||||
wipe_filesystem: true
|
||||
/dev/disk/by-partlabel/swap:
|
||||
format: swap
|
||||
path: swap`,
|
||||
output: `#!/bin/sh
|
||||
|
||||
PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
if ! command -v info >/dev/null; then
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
}
|
||||
fi
|
||||
|
||||
if ! command -v die >/dev/null; then
|
||||
die() {
|
||||
printf '%s\n' "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
already_formatted() {
|
||||
if ! command -v wipefs >/dev/null ; then
|
||||
info "warewulf: wipefs not found, cannot check if device is already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if wipefs -n "${1}" &>/dev/null; then
|
||||
info "warewulf: ${1} already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
if command -v mkswap >/dev/null; then :
|
||||
if false || ! already_formatted /dev/disk/by-partlabel/swap; then
|
||||
info "warewulf: mkswap: formatting /dev/disk/by-partlabel/swap"
|
||||
mkswap /dev/disk/by-partlabel/swap || die "warewulf: mkswap: failed to format /dev/disk/by-partlabel/swap"
|
||||
else
|
||||
info "warewulf: mkswap: skipping /dev/disk/by-partlabel/swap"
|
||||
continue
|
||||
fi
|
||||
else
|
||||
info "warewulf: mkswap not found"
|
||||
fi
|
||||
`,
|
||||
},
|
||||
|
||||
"mkswap:20-mkswap.sh.ww (native overwrite)": {
|
||||
args: []string{"--quiet=true", "--render=node1", "mkswap", "warewulf/wwinit.d/20-mkswap.sh.ww"},
|
||||
nodesConf: `
|
||||
nodes:
|
||||
node1:
|
||||
filesystems:
|
||||
/dev/disk/by-partlabel/rootfs:
|
||||
format: ext4
|
||||
path: /
|
||||
/dev/disk/by-partlabel/scratch:
|
||||
format: ext4
|
||||
path: /scratch
|
||||
wipe_filesystem: true
|
||||
/dev/disk/by-partlabel/swap:
|
||||
format: swap
|
||||
path: swap
|
||||
wipe_filesystem: true`,
|
||||
output: `#!/bin/sh
|
||||
|
||||
PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
if ! command -v info >/dev/null; then
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
}
|
||||
fi
|
||||
|
||||
if ! command -v die >/dev/null; then
|
||||
die() {
|
||||
printf '%s\n' "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
already_formatted() {
|
||||
if ! command -v wipefs >/dev/null ; then
|
||||
info "warewulf: wipefs not found, cannot check if device is already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if wipefs -n "${1}" &>/dev/null; then
|
||||
info "warewulf: ${1} already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
if command -v mkswap >/dev/null; then :
|
||||
if true || ! already_formatted /dev/disk/by-partlabel/swap; then
|
||||
info "warewulf: mkswap: formatting /dev/disk/by-partlabel/swap"
|
||||
mkswap /dev/disk/by-partlabel/swap || die "warewulf: mkswap: failed to format /dev/disk/by-partlabel/swap"
|
||||
else
|
||||
info "warewulf: mkswap: skipping /dev/disk/by-partlabel/swap"
|
||||
continue
|
||||
fi
|
||||
else
|
||||
info "warewulf: mkswap not found"
|
||||
fi
|
||||
`,
|
||||
},
|
||||
}
|
||||
|
||||
for name, tt := range tests {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
env := testenv.New(t)
|
||||
defer env.RemoveAll()
|
||||
env.ImportFile("var/lib/warewulf/overlays/mkswap/rootfs/warewulf/wwinit.d/20-mkswap.sh.ww", "../rootfs/warewulf/wwinit.d/20-mkswap.sh.ww")
|
||||
env.WriteFile("etc/warewulf/nodes.conf", tt.nodesConf)
|
||||
cmd := show.GetCommand()
|
||||
cmd.SetArgs(tt.args)
|
||||
stdout := bytes.NewBufferString("")
|
||||
stderr := bytes.NewBufferString("")
|
||||
logbuf := bytes.NewBufferString("")
|
||||
cmd.SetOut(stdout)
|
||||
cmd.SetErr(stderr)
|
||||
wwlog.SetLogWriter(logbuf)
|
||||
err := cmd.Execute()
|
||||
assert.NoError(t, err)
|
||||
assert.Empty(t, stdout.String())
|
||||
assert.Empty(t, stderr.String())
|
||||
assert.Equal(t, tt.output, logbuf.String())
|
||||
})
|
||||
}
|
||||
}
|
||||
69
overlays/mkswap/rootfs/warewulf/wwinit.d/20-mkswap.sh.ww
Normal file
69
overlays/mkswap/rootfs/warewulf/wwinit.d/20-mkswap.sh.ww
Normal file
@@ -0,0 +1,69 @@
|
||||
#!/bin/sh
|
||||
|
||||
PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
|
||||
|
||||
if ! command -v info >/dev/null; then
|
||||
info() {
|
||||
printf '%s\n' "$*"
|
||||
}
|
||||
fi
|
||||
|
||||
if ! command -v die >/dev/null; then
|
||||
die() {
|
||||
printf '%s\n' "$*" >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
already_formatted() {
|
||||
if ! command -v wipefs >/dev/null ; then
|
||||
info "warewulf: wipefs not found, cannot check if device is already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if wipefs -n "${1}" &>/dev/null; then
|
||||
info "warewulf: ${1} already formatted"
|
||||
return 0
|
||||
fi
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
if command -v mkswap >/dev/null; then :
|
||||
{{- $filesystems := list }}
|
||||
{{- if .FileSystems }}
|
||||
{{- range $fs := .ThisNode.FileSystemList }}
|
||||
{{- if eq $fs.Format "swap" }}
|
||||
{{- $fsDict := dict "device" $fs.Id "overwrite" $fs.WipeFileSystem }}
|
||||
{{- if $fs.Format }}
|
||||
{{- $_ := set $fsDict "type" $fs.Format }}
|
||||
{{- end }}
|
||||
{{- if $fs.Options }}
|
||||
{{- $_ := set $fsDict "options" ($fs.Options | join " ") }}
|
||||
{{- end }}
|
||||
{{- if $fs.Label }}
|
||||
{{- $_ := set $fsDict "label" $fs.Label }}
|
||||
{{- end }}
|
||||
{{- if $fs.Uuid }}
|
||||
{{- $_ := set $fsDict "uuid" $fs.Uuid }}
|
||||
{{- end }}
|
||||
{{- $filesystems = append $filesystems $fsDict }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{- $filesystems = index .Resources "mkswap" }}
|
||||
{{- end }}
|
||||
{{- range $fs := $filesystems }}
|
||||
{{- if $fs.device }}
|
||||
if {{if $fs.overwrite}}true{{else}}false{{end}} || ! already_formatted {{ $fs.device }}; then
|
||||
info "warewulf: mkswap: formatting {{ $fs.device }}"
|
||||
mkswap {{ not (empty $fs.label) | ternary (print "--label=" $fs.label) "" }} {{ not (empty $fs.uuid) | ternary (print "--uuid=" $fs.uuid) "" }} {{ $fs.device }} {{ default "" $fs.size }} || die "warewulf: mkswap: failed to format {{ $fs.device }}"
|
||||
else
|
||||
info "warewulf: mkswap: skipping {{ $fs.device }}"
|
||||
continue
|
||||
fi
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
else
|
||||
info "warewulf: mkswap not found"
|
||||
fi
|
||||
Reference in New Issue
Block a user