From 1fca0057d33850b3197b22ff8fd030cb1eca4344 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Mon, 11 Dec 2023 14:22:05 +0100 Subject: [PATCH] updated WW_INTERNAL to 45 for 4.5.x release Internal version update is necessary as new structures were added, most obviously the disk, partitions and file system structures. Old configurations will work as expected. Signed-off-by: Christian Goll --- CHANGELOG.md | 1 + etc/nodes.conf | 2 +- etc/warewulf.conf | 2 +- .../app/wwctl/container/list/main_test.go | 2 +- internal/app/wwctl/node/add/main_test.go | 38 +++++++-------- internal/app/wwctl/node/list/main_test.go | 10 ++-- internal/app/wwctl/node/set/main_test.go | 48 +++++++++---------- internal/app/wwctl/overlay/imprt/main_test.go | 2 +- internal/app/wwctl/overlay/show/main_test.go | 2 +- internal/app/wwctl/profile/add/main_test.go | 6 +-- internal/app/wwctl/profile/list/main_test.go | 8 ++-- internal/pkg/config/root_test.go | 4 +- internal/pkg/node/hash_test.go | 6 +-- internal/pkg/node/node_test.go | 4 +- internal/pkg/overlay/funcmap_test.go | 2 +- internal/pkg/testenv/testenv.go | 4 +- internal/pkg/testenv/testenv_test.go | 2 +- internal/pkg/warewulfd/provision_test.go | 2 +- userdocs/quickstart/suse15.rst | 2 +- 19 files changed, 74 insertions(+), 73 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af1360f5..f36adf8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -150,6 +150,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - uniform shebang usage in scripts of init.d folder #821 - Check if commas are allowes in node/profile set - Removed paths.tftpdir and paths.datadir +- Updated WW_INTERNAL to 45 for upcoming 4.5.x release ## [4.4.0] 2023-01-18 diff --git a/etc/nodes.conf b/etc/nodes.conf index 6cc8a52a..4dd95e03 100644 --- a/etc/nodes.conf +++ b/etc/nodes.conf @@ -1,4 +1,4 @@ -WW_INTERNAL: 43 +WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node diff --git a/etc/warewulf.conf b/etc/warewulf.conf index 0ab38da9..79a7da47 100644 --- a/etc/warewulf.conf +++ b/etc/warewulf.conf @@ -1,4 +1,4 @@ -WW_INTERNAL: 43 +WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/internal/app/wwctl/container/list/main_test.go b/internal/app/wwctl/container/list/main_test.go index f90710ff..be5290ee 100644 --- a/internal/app/wwctl/container/list/main_test.go +++ b/internal/app/wwctl/container/list/main_test.go @@ -27,7 +27,7 @@ func Test_List(t *testing.T) { name: "container list test", args: []string{}, stdout: `test 1 kernel`, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: diff --git a/internal/app/wwctl/node/add/main_test.go b/internal/app/wwctl/node/add/main_test.go index b523c7f6..473ed330 100644 --- a/internal/app/wwctl/node/add/main_test.go +++ b/internal/app/wwctl/node/add/main_test.go @@ -24,7 +24,7 @@ func Test_Add(t *testing.T) { args: []string{"n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -35,7 +35,7 @@ nodes: args: []string{"--profile=foo", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -46,7 +46,7 @@ nodes: args: []string{"--discoverable=true", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -58,7 +58,7 @@ nodes: args: []string{"--discoverable=yes", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -71,7 +71,7 @@ nodes: wantErr: true, stdout: "", chkout: false, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: {} `}, @@ -79,7 +79,7 @@ nodes: {} args: []string{"--discoverable=false", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -91,7 +91,7 @@ nodes: args: []string{"--kernelargs=foo", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -104,7 +104,7 @@ nodes: args: []string{"n01", "n02"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -118,7 +118,7 @@ nodes: args: []string{"--ipaddr6=fdaa::1", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -132,7 +132,7 @@ nodes: args: []string{"--ipaddr=10.0.0.1", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -147,7 +147,7 @@ nodes: wantErr: true, stdout: "", chkout: false, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: {} `}, @@ -155,7 +155,7 @@ nodes: {} args: []string{"--ipaddr=10.10.0.1", "n[01-02,03]"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -181,7 +181,7 @@ nodes: args: []string{"--ipaddr=10.10.0.1", "--netname=foo", "n[01-03]"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -207,7 +207,7 @@ nodes: args: []string{"--ipaddr=10.10.0.1", "--netname=foo", "--ipmiaddr=10.20.0.1", "n[01-03]"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -239,7 +239,7 @@ nodes: args: []string{"--fsname=/dev/vda1", "--fspath=/var", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -253,7 +253,7 @@ nodes: args: []string{"--fsname=dev/vda1", "--fspath=/var", "n01"}, wantErr: true, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: {} `}, @@ -261,7 +261,7 @@ nodes: {} args: []string{"--fsname=var", "--fspath=/var", "--partname=var", "--diskname=/dev/vda", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -279,7 +279,7 @@ nodes: args: []string{"--fsname=var", "--fspath=/var", "--fsformat=btrfs", "--partname=var", "--diskname=/dev/vda", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: {} nodes: n01: @@ -304,7 +304,7 @@ nodes: assert.NoError(t, tempWarewulfConf.Sync()) assert.NoError(t, warewulfconf.New().Read(tempWarewulfConf.Name())) - nodes_yml := `WW_INTERNAL: 43` + nodes_yml := `WW_INTERNAL: 45` tempNodeConf, nodesConfErr := os.CreateTemp("", "nodes.conf-") assert.NoError(t, nodesConfErr) defer os.Remove(tempNodeConf.Name()) diff --git a/internal/app/wwctl/node/list/main_test.go b/internal/app/wwctl/node/list/main_test.go index 6e57453d..68c585d1 100644 --- a/internal/app/wwctl/node/list/main_test.go +++ b/internal/app/wwctl/node/list/main_test.go @@ -28,7 +28,7 @@ func Test_List(t *testing.T) { stdout: ` NODE NAME PROFILES NETWORK n01 default `, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: @@ -45,7 +45,7 @@ nodes: n01 default n02 default `, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: @@ -65,7 +65,7 @@ nodes: n01 default n02 default `, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: @@ -85,7 +85,7 @@ nodes: n01 default n03 default `, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: @@ -113,7 +113,7 @@ nodes: stdout: ` NODE NAME PROFILES NETWORK n01 default `, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: diff --git a/internal/app/wwctl/node/set/main_test.go b/internal/app/wwctl/node/set/main_test.go index c77f7409..87082e29 100644 --- a/internal/app/wwctl/node/set/main_test.go +++ b/internal/app/wwctl/node/set/main_test.go @@ -55,7 +55,7 @@ func Test_Single_Node_Change_Profile(t *testing.T) { args: []string{"--profile=foo", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -63,7 +63,7 @@ nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -81,7 +81,7 @@ func Test_Multiple_Add_Tests(t *testing.T) { args: []string{"--profile=foo", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -89,7 +89,7 @@ nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -102,7 +102,7 @@ nodes: args: []string{"--profile=foo", "n0[1-2]"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -113,7 +113,7 @@ nodes: n02: profiles: - default`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -129,7 +129,7 @@ nodes: args: []string{"--ipmitagadd", "foo=baar", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -137,7 +137,7 @@ nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -153,7 +153,7 @@ nodes: args: []string{"--tagdel", "tag1", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -164,7 +164,7 @@ nodes: tags: tag1: value1 tag2: value2`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -179,7 +179,7 @@ nodes: args: []string{"--fsname=var", "--fspath=/var", "--fsformat=btrfs", "--partname=var", "--diskname=/dev/vda", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -188,7 +188,7 @@ nodes: profiles: - default `, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -209,7 +209,7 @@ nodes: args: []string{"--fsdel=var", "n01"}, wantErr: true, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -227,7 +227,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -248,7 +248,7 @@ nodes: args: []string{"--fsdel=/dev/disk/by-partlabel/var", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -266,7 +266,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -283,7 +283,7 @@ nodes: args: []string{"--partdel=var", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -301,7 +301,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -320,7 +320,7 @@ nodes: args: []string{"--diskdel=/dev/vda", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -338,7 +338,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -355,7 +355,7 @@ nodes: args: []string{"--mtu", "1234", "--netname=mynet", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -363,7 +363,7 @@ nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: default: comment: testit @@ -379,7 +379,7 @@ nodes: args: []string{"--tagadd", "nodetag1=nodevalue1", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 + inDB: `WW_INTERNAL: 45 nodeprofiles: p1: comment: testit 1 @@ -394,7 +394,7 @@ nodes: profiles: - p1 - p2`, - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: p1: comment: testit 1 diff --git a/internal/app/wwctl/overlay/imprt/main_test.go b/internal/app/wwctl/overlay/imprt/main_test.go index e79a5653..8d8ef486 100644 --- a/internal/app/wwctl/overlay/imprt/main_test.go +++ b/internal/app/wwctl/overlay/imprt/main_test.go @@ -45,7 +45,7 @@ func Test_List(t *testing.T) { t.FailNow() } - inDb := `WW_INTERNAL: 43 + inDb := `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: {} diff --git a/internal/app/wwctl/overlay/show/main_test.go b/internal/app/wwctl/overlay/show/main_test.go index 25e08ed8..47e87a89 100644 --- a/internal/app/wwctl/overlay/show/main_test.go +++ b/internal/app/wwctl/overlay/show/main_test.go @@ -21,7 +21,7 @@ var ( func Test_Overlay_List(t *testing.T) { env := testenv.New(t) env.WriteFile(t, "etc/warewulf/nodes.conf", - `WW_INTERNAL: 43 + `WW_INTERNAL: 45 nodeprofiles: default: tags: diff --git a/internal/app/wwctl/profile/add/main_test.go b/internal/app/wwctl/profile/add/main_test.go index b106c6c8..b5dc587f 100644 --- a/internal/app/wwctl/profile/add/main_test.go +++ b/internal/app/wwctl/profile/add/main_test.go @@ -24,7 +24,7 @@ func Test_Add(t *testing.T) { args: []string{"--yes", "p01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: p01: {} nodes: {} @@ -35,7 +35,7 @@ nodes: {} args: []string{"--yes", "--netname", "primary", "--netdev", "eno3", "p02"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 43 + outDb: `WW_INTERNAL: 45 nodeprofiles: p02: network devices: @@ -55,7 +55,7 @@ nodes: {} assert.NoError(t, tempWarewulfConf.Sync()) warewulfconf.ConfigFile = tempWarewulfConf.Name() - nodes_yml := `WW_INTERNAL: 43` + nodes_yml := `WW_INTERNAL: 45` tempNodeConf, nodesConfErr := os.CreateTemp("", "nodes.conf-") assert.NoError(t, nodesConfErr) defer os.Remove(tempNodeConf.Name()) diff --git a/internal/app/wwctl/profile/list/main_test.go b/internal/app/wwctl/profile/list/main_test.go index 13d877b2..15243b16 100644 --- a/internal/app/wwctl/profile/list/main_test.go +++ b/internal/app/wwctl/profile/list/main_test.go @@ -25,7 +25,7 @@ func Test_List(t *testing.T) { args: []string{}, stdout: `PROFILE NAME COMMENT/DESCRIPTION default --`, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: @@ -40,7 +40,7 @@ nodes: stdout: `PROFILE NAME COMMENT/DESCRIPTION default -- test --`, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} test: {} @@ -55,7 +55,7 @@ nodes: args: []string{"test,"}, stdout: `PROFILE NAME COMMENT/DESCRIPTION test --`, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} test: {} @@ -71,7 +71,7 @@ nodes: stdout: `PROFILE NAME COMMENT/DESCRIPTION default -- test --`, - inDb: `WW_INTERNAL: 43 + inDb: `WW_INTERNAL: 45 nodeprofiles: default: {} test: {} diff --git a/internal/pkg/config/root_test.go b/internal/pkg/config/root_test.go index d57d1557..95b4e9c4 100644 --- a/internal/pkg/config/root_test.go +++ b/internal/pkg/config/root_test.go @@ -57,7 +57,7 @@ func TestDefaultRootConf(t *testing.T) { } func TestInitializedFromFile(t *testing.T) { - example_warewulf_conf := "WW_INTERNAL: 43" + example_warewulf_conf := "WW_INTERNAL: 45" tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-") assert.NoError(t, warewulfConfErr) defer os.Remove(tempWarewulfConf.Name()) @@ -72,7 +72,7 @@ func TestInitializedFromFile(t *testing.T) { } func TestExampleRootConf(t *testing.T) { - example_warewulf_conf := `WW_INTERNAL: 43 + example_warewulf_conf := `WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/internal/pkg/node/hash_test.go b/internal/pkg/node/hash_test.go index 9f893fae..b2e84d7e 100644 --- a/internal/pkg/node/hash_test.go +++ b/internal/pkg/node/hash_test.go @@ -10,7 +10,7 @@ import ( func TestHash(t *testing.T) { nodeConfYml1 := ` -WW_INTERNAL: 43 +WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node @@ -33,7 +33,7 @@ nodes: ipaddr: 10.0.10.2 ` nodeConfYml2 := ` -WW_INTERNAL: 43 +WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node @@ -56,7 +56,7 @@ nodes: ipaddr: 10.0.10.1 ` nodeConfYml3 := ` -WW_INTERNAL: 43 +WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node diff --git a/internal/pkg/node/node_test.go b/internal/pkg/node/node_test.go index 595f9632..8ee04347 100644 --- a/internal/pkg/node/node_test.go +++ b/internal/pkg/node/node_test.go @@ -9,7 +9,7 @@ import ( func TestNodeUpdate(t *testing.T) { var nodeConfig = ` -WW_INTERNAL: 43 +WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node @@ -40,7 +40,7 @@ nodes: } func TestNodeDisk(t *testing.T) { - node_config := `WW_INTERNAL: 43 + node_config := `WW_INTERNAL: 45 nodes: n1: disks: diff --git a/internal/pkg/overlay/funcmap_test.go b/internal/pkg/overlay/funcmap_test.go index 19f8a2f5..5ffef11c 100644 --- a/internal/pkg/overlay/funcmap_test.go +++ b/internal/pkg/overlay/funcmap_test.go @@ -7,7 +7,7 @@ import ( ) func Test_createIgnitionJson(t *testing.T) { - node_config := `WW_INTERNAL: 43 + node_config := `WW_INTERNAL: 45 nodes: n1: disks: diff --git a/internal/pkg/testenv/testenv.go b/internal/pkg/testenv/testenv.go index 4e4d9169..8e8e4076 100644 --- a/internal/pkg/testenv/testenv.go +++ b/internal/pkg/testenv/testenv.go @@ -17,8 +17,8 @@ import ( ) const initWarewulfConf = `WW_INTERNAL: 0` -const initDefaultsConf = `WW_INTERNAL: 43` -const initNodesConf = `WW_INTERNAL: 43 +const initDefaultsConf = `WW_INTERNAL: 45` +const initNodesConf = `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: diff --git a/internal/pkg/testenv/testenv_test.go b/internal/pkg/testenv/testenv_test.go index 2c2d17bf..46623c96 100644 --- a/internal/pkg/testenv/testenv_test.go +++ b/internal/pkg/testenv/testenv_test.go @@ -19,7 +19,7 @@ func Test_Basic(t *testing.T) { func Test_two_nodes(t *testing.T) { env := New(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 45 nodeprofiles: default: {} nodes: diff --git a/internal/pkg/warewulfd/provision_test.go b/internal/pkg/warewulfd/provision_test.go index f286b8c7..1b1446a9 100644 --- a/internal/pkg/warewulfd/provision_test.go +++ b/internal/pkg/warewulfd/provision_test.go @@ -37,7 +37,7 @@ func Test_ProvisionSend(t *testing.T) { assert.NoError(t, err) defer conf_file.Close() { - _, err := conf_file.WriteString(`WW_INTERNAL: 43 + _, err := conf_file.WriteString(`WW_INTERNAL: 45 nodeprofiles: default: container name: suse diff --git a/userdocs/quickstart/suse15.rst b/userdocs/quickstart/suse15.rst index f93db5ae..bb15b7a8 100644 --- a/userdocs/quickstart/suse15.rst +++ b/userdocs/quickstart/suse15.rst @@ -46,7 +46,7 @@ address of your cluster's private network interface: .. code-block:: yaml - WW_INTERNAL: 43 + WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0