From a7325b6ffaf3a1c0aacc79b343b98370ee719386 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Sat, 2 Nov 2024 19:54:14 -0600 Subject: [PATCH] Remove WW_INTERNAL Signed-off-by: Jonathon Anderson --- docs/man/man5/warewulf.conf.5 | 7 - etc/nodes.conf | 1 - etc/warewulf.conf | 1 - internal/app/wwctl/clean/main_test.go | 3 +- .../app/wwctl/container/list/main_test.go | 2 +- internal/app/wwctl/node/add/main_test.go | 57 +++----- internal/app/wwctl/node/list/main_test.go | 64 ++++----- internal/app/wwctl/node/sensors/root_test.go | 2 +- internal/app/wwctl/node/set/main_test.go | 128 ++++++------------ internal/app/wwctl/overlay/imprt/main_test.go | 7 +- internal/app/wwctl/overlay/show/main_test.go | 9 +- internal/app/wwctl/power/cycle/root_test.go | 2 +- internal/app/wwctl/power/off/root_test.go | 2 +- internal/app/wwctl/power/on/root_test.go | 2 +- internal/app/wwctl/power/reset/root_test.go | 2 +- internal/app/wwctl/power/soft/root_test.go | 2 +- internal/app/wwctl/power/status/root_test.go | 2 +- internal/app/wwctl/profile/add/main_test.go | 9 +- internal/app/wwctl/profile/list/main_test.go | 20 +-- internal/app/wwctl/profile/set/main_test.go | 18 +-- internal/app/wwctl/root.go | 2 +- internal/pkg/config/buildconfig.go.in | 3 - internal/pkg/config/root.go | 1 - internal/pkg/config/root_test.go | 4 +- internal/pkg/node/datastructure.go | 4 - internal/pkg/node/hash_test.go | 3 - internal/pkg/overlay/funcmap_test.go | 3 +- internal/pkg/testenv/testenv.go | 5 +- internal/pkg/testenv/testenv_test.go | 3 +- internal/pkg/warewulfd/provision_test.go | 3 +- overlays/NetworkManager/internal/nodes.conf | 1 - .../internal/nodes_empty_mac.conf | 1 - overlays/fstab/internal/warewulf.conf | 1 - overlays/host/internal/warewulf.conf | 1 - overlays/host/internal/warewulf.conf-static | 1 - overlays/hosts/internal/warewulf.conf | 1 - overlays/wwinit/internal/warewulf.conf | 1 - overlays/wwinit/internal/wwinit_test.go | 1 - userdocs/contents/configuration.rst | 1 - .../development-environment-vagrant.rst | 1 - userdocs/quickstart/debian12.rst | 1 - userdocs/quickstart/el.rst | 1 - userdocs/quickstart/suse15.rst | 1 - 43 files changed, 126 insertions(+), 258 deletions(-) diff --git a/docs/man/man5/warewulf.conf.5 b/docs/man/man5/warewulf.conf.5 index 78716a41..bb22172d 100644 --- a/docs/man/man5/warewulf.conf.5 +++ b/docs/man/man5/warewulf.conf.5 @@ -16,12 +16,6 @@ warewulf.conf is defined using YAML document markup syntax. .LP The configuration parameters available include: -.TP -\fBWW_INTERNAL\fP -Specifies the version of the configuration file format. The current -version is 43. -.IP - .TP \fBipaddr\fP This is the control node's networking interface connecting to the @@ -279,7 +273,6 @@ A sample configuration file for a typical deployment, with all dependent services enabled. .EX -WW_INTERNAL: 45 ipaddr: 10.0.0.1 network: 10.0.0.0 netmask: 255.255.0.0 diff --git a/etc/nodes.conf b/etc/nodes.conf index 62d5b496..1b8c983a 100644 --- a/etc/nodes.conf +++ b/etc/nodes.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 46 nodeprofiles: default: comment: This profile is automatically included for each node diff --git a/etc/warewulf.conf b/etc/warewulf.conf index ae9203e4..b0589a91 100644 --- a/etc/warewulf.conf +++ b/etc/warewulf.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 45 ipaddr: 10.0.0.1 netmask: 255.255.252.0 warewulf: diff --git a/internal/app/wwctl/clean/main_test.go b/internal/app/wwctl/clean/main_test.go index 23d8c38b..6396e8bd 100644 --- a/internal/app/wwctl/clean/main_test.go +++ b/internal/app/wwctl/clean/main_test.go @@ -12,8 +12,7 @@ func Test_Clean(t *testing.T) { wwlog.SetLogLevel(wwlog.DEBUG) env := testenv.New(t) env.WriteFile(t, "etc/warewulf/nodes.conf", - `WW_INTERNAL: 45 -nodeprofiles: {} + `nodeprofiles: {} nodes: node1: {} `) diff --git a/internal/app/wwctl/container/list/main_test.go b/internal/app/wwctl/container/list/main_test.go index 1e841128..1baf769c 100644 --- a/internal/app/wwctl/container/list/main_test.go +++ b/internal/app/wwctl/container/list/main_test.go @@ -29,7 +29,7 @@ CONTAINER NAME NODES KERNEL VERSION CREATION TIME MODIFICATION TIME -------------- ----- -------------- ------------- ----------------- ---- test 1 kernel 01 Jan 70 00:00 UTC 01 Jan 70 00:00 UTC 0 B `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: diff --git a/internal/app/wwctl/node/add/main_test.go b/internal/app/wwctl/node/add/main_test.go index 01a2811c..104cca51 100644 --- a/internal/app/wwctl/node/add/main_test.go +++ b/internal/app/wwctl/node/add/main_test.go @@ -23,8 +23,7 @@ func Test_Add(t *testing.T) { args: []string{"n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -34,8 +33,7 @@ nodes: args: []string{"--profile=foo", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -45,8 +43,7 @@ nodes: args: []string{"--discoverable=true", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: discoverable: "true" @@ -57,8 +54,7 @@ nodes: args: []string{"--discoverable", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: discoverable: "true" @@ -70,16 +66,14 @@ nodes: wantErr: true, stdout: "", chkout: false, - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: {} `}, {name: "single node add, discoverable false", args: []string{"--discoverable=false", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: discoverable: "false" @@ -90,8 +84,7 @@ nodes: args: []string{"--kernelargs=foo", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: kernel: @@ -103,8 +96,7 @@ nodes: args: []string{"n01", "n02"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -117,8 +109,7 @@ nodes: args: []string{"--ipaddr6=fdaa::1", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -131,8 +122,7 @@ nodes: args: []string{"--ipaddr=10.0.0.1", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -146,16 +136,14 @@ nodes: wantErr: true, stdout: "", chkout: false, - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: {} `}, {name: "three nodes with ipaddr", args: []string{"--ipaddr=10.10.0.1", "n[01-02,03]"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -180,8 +168,7 @@ nodes: args: []string{"--ipaddr=10.10.0.1", "--netname=foo", "n[01-03]"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -206,8 +193,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: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: ipmi: @@ -238,8 +224,7 @@ nodes: args: []string{"--fsname=/dev/vda1", "--fspath=/var", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -252,16 +237,14 @@ nodes: args: []string{"--fsname=dev/vda1", "--fspath=/var", "n01"}, wantErr: true, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: {} `}, {name: "one node with filesystem and partition ", args: []string{"--fsname=var", "--fspath=/var", "--partname=var", "--diskname=/dev/vda", "--partnumber=1", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -279,8 +262,7 @@ nodes: args: []string{"--fsname=var", "--fspath=/var", "--fsformat=btrfs", "--partname=var", "--diskname=/dev/vda", "--partnumber=1", "n01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -299,8 +281,7 @@ nodes: warewulfd.SetNoDaemon() for _, tt := range tests { env := testenv.New(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", - `WW_INTERNAL: 45`) + env.WriteFile(t, "etc/warewulf/nodes.conf", ``) var err error t.Run(tt.name, func(t *testing.T) { baseCmd := GetCommand() diff --git a/internal/app/wwctl/node/list/main_test.go b/internal/app/wwctl/node/list/main_test.go index b105579b..e0dcdb9e 100644 --- a/internal/app/wwctl/node/list/main_test.go +++ b/internal/app/wwctl/node/list/main_test.go @@ -33,8 +33,7 @@ NODE NAME PROFILES NETWORK --------- -------- ------- n01 [default] -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: {} nodes: n01: @@ -52,8 +51,7 @@ NODE NAME PROFILES NETWORK n01 [default] -- n02 [default] -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: {} nodes: n01: @@ -74,8 +72,7 @@ NODE NAME PROFILES NETWORK n01 [default] -- n02 [default] -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: {} nodes: n01: @@ -96,8 +93,7 @@ NODE NAME PROFILES NETWORK n01 [default] -- n03 [default] -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: {} nodes: n01: @@ -126,8 +122,7 @@ NODE NAME PROFILES NETWORK --------- -------- ------- n01 [default] -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: {} nodes: n01: @@ -147,8 +142,7 @@ NODE NAME PROFILES NETWORK --------- -------- ------- n01 [default] default `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: network devices: default: @@ -168,8 +162,7 @@ NODE FIELD PROFILE VALUE n01 Comment default profilecomment n01 Profiles -- default `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: comment: profilecomment nodes: @@ -187,8 +180,7 @@ NODE FIELD PROFILE VALUE n01 Comment SUPERSEDED nodecomment n01 Profiles -- default `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: comment: profilecomment nodes: @@ -206,8 +198,7 @@ NODE IPMI IPADDR IPMI PORT IPMI USERNAME IPMI INTERFACE ---- ----------- --------- ------------- -------------- n01 -- admin -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: ipmi: username: admin @@ -225,8 +216,7 @@ NODE IPMI IPADDR IPMI PORT IPMI USERNAME IPMI INTERFACE ---- ----------- --------- ------------- -------------- n01 -- user -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: default: ipmi: username: admin @@ -246,8 +236,7 @@ NODE NAME PROFILES NETWORK --------- -------- ------- n01 [p1 p2] -- `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: p1: {} p2: {} nodes: @@ -265,8 +254,7 @@ NODE FIELD PROFILE VALUE ---- ----- ------- ----- n01 Profiles -- p1,p2 `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: p1: {} p2: {} nodes: @@ -284,8 +272,7 @@ NODE NAME KERNEL OVERRIDE CONTAINER OVERLAYS (S/R) --------- --------------- --------- -------------- n01 -- -- /rop1,rop2 `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: p1: runtime overlay: - rop1 @@ -304,8 +291,7 @@ NODE NAME KERNEL OVERRIDE CONTAINER OVERLAYS (S/R) --------- --------------- --------- -------------- n01 -- -- sop1/nop1,~rop1,rop1,rop2 `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: p1: system overlay: - sop1 @@ -331,8 +317,7 @@ n01 Profiles -- p1 n01 RuntimeOverlay p1+ nop1,~rop1,rop1,rop2 n01 SystemOverlay p1 sop1 `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: p1: system overlay: - sop1 @@ -357,8 +342,7 @@ NODE FIELD PROFILE VALUE n01 Profiles -- p1 n01 RuntimeOverlay p1+ nop1,rop1,rop2 `, - inDb: `WW_INTERNAL: 45 -nodeprofiles: + inDb: `nodeprofiles: p1: runtime overlay: - rop1 @@ -379,8 +363,7 @@ NODE FIELD PROFILE VALUE ---- ----- ------- ----- n1 NetDevs[default].OnBoot -- true `, - inDb: `WW_INTERNAL: 45 -nodes: + inDb: `nodes: n1: network devices: default: @@ -394,15 +377,14 @@ nodes: NODE FIELD PROFILE VALUE ---- ----- ------- ----- `, - inDb: `WW_INTERNAL: 46 -nodes: + inDb: `nodes: wwnode1: network devices: default: {} `}, } - conf_yml := `WW_INTERNAL: 0` + conf_yml := `` tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-") assert.NoError(t, warewulfConfErr) defer os.Remove(tempWarewulfConf.Name()) @@ -459,7 +441,7 @@ func TestListMultipleFormats(t *testing.T) { kernel: {} ipmi: {} `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: @@ -509,7 +491,7 @@ nodes: } ] `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: @@ -593,7 +575,7 @@ nodes: } ] `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: @@ -618,7 +600,7 @@ nodes: kernel: {} ipmi: {} `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: diff --git a/internal/app/wwctl/node/sensors/root_test.go b/internal/app/wwctl/node/sensors/root_test.go index 3fff5f6a..450aab4c 100644 --- a/internal/app/wwctl/node/sensors/root_test.go +++ b/internal/app/wwctl/node/sensors/root_test.go @@ -15,7 +15,7 @@ func Test_Sensors(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/node/set/main_test.go b/internal/app/wwctl/node/set/main_test.go index 6d099a61..a9ecd8e3 100644 --- a/internal/app/wwctl/node/set/main_test.go +++ b/internal/app/wwctl/node/set/main_test.go @@ -56,16 +56,14 @@ func Test_Single_Node_Change_Profile(t *testing.T) { args: []string{"--profile=foo", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -81,15 +79,13 @@ func Test_Node_Unset(t *testing.T) { args: []string{"--comment=UNDEF", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: {} + inDB: `nodeprofiles: {} nodes: n01: comment: foo profiles: - default`, - outDb: `WW_INTERNAL: 43 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: profiles: @@ -103,13 +99,11 @@ func Test_Set_Ipmi_Write_Explicit(t *testing.T) { args: []string{"--ipmiwrite", "true", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: {} + inDB: `nodeprofiles: {} nodes: n01: {} `, - outDb: `WW_INTERNAL: 43 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: ipmi: @@ -122,13 +116,11 @@ func Test_Set_Ipmi_Write_Implicit(t *testing.T) { args: []string{"--ipmiwrite", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: {} + inDB: `nodeprofiles: {} nodes: n01: {} `, - outDb: `WW_INTERNAL: 43 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: ipmi: @@ -142,15 +134,13 @@ func Test_Unset_Ipmi_Write(t *testing.T) { args: []string{"--ipmiwrite=UNDEF", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: {} + inDB: `nodeprofiles: {} nodes: n01: ipmi: write: "true" `, - outDb: `WW_INTERNAL: 43 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: {} `} @@ -161,15 +151,13 @@ func Test_Unset_Ipmi_Write_False(t *testing.T) { args: []string{"--ipmiwrite=UNDEF", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: {} + inDB: `nodeprofiles: {} nodes: n01: ipmi: write: "false" `, - outDb: `WW_INTERNAL: 43 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: {} `} @@ -180,8 +168,7 @@ func Test_Ipmi_Hidden_False(t *testing.T) { args: []string{"--ipmiwrite=false", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: + inDB: `nodeprofiles: default: ipmi: write: "true" @@ -190,8 +177,7 @@ nodes: profiles: - default `, - outDb: `WW_INTERNAL: 43 -nodeprofiles: + outDb: `nodeprofiles: default: ipmi: write: "true" @@ -211,16 +197,14 @@ func Test_Multiple_Set_Tests(t *testing.T) { args: []string{"--profile=foo", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -232,8 +216,7 @@ nodes: args: []string{"--profile=foo", "n0[1-2]"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -243,8 +226,7 @@ nodes: n02: profiles: - default`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -259,16 +241,14 @@ nodes: args: []string{"--ipmitagadd", "foo=baar", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -283,8 +263,7 @@ nodes: args: []string{"--tagdel", "tag1", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -294,8 +273,7 @@ nodes: tags: tag1: value1 tag2: value2`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -309,8 +287,7 @@ nodes: args: []string{"--fsname=var", "--fspath=/var", "--fsformat=btrfs", "--partname=var", "--partnumber=1", "--diskname=/dev/vda", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -318,8 +295,7 @@ nodes: profiles: - default `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -340,8 +316,7 @@ nodes: args: []string{"--fsdel=foo", "n01"}, wantErr: true, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -359,8 +334,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -381,8 +355,7 @@ nodes: args: []string{"--fsdel=/dev/disk/by-partlabel/var", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -400,8 +373,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -418,8 +390,7 @@ nodes: args: []string{"--partdel=var", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -437,8 +408,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -454,8 +424,7 @@ nodes: args: []string{"--diskdel=/dev/vda", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: @@ -472,8 +441,7 @@ nodes: format: btrfs path: /var `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -489,16 +457,14 @@ nodes: args: []string{"--mtu", "1234", "--netname=mynet", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit nodes: @@ -513,8 +479,7 @@ nodes: args: []string{"--tagadd", "nodetag1=nodevalue1", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: p1: comment: testit 1 tags: @@ -528,8 +493,7 @@ nodes: profiles: - p1 - p2`, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: p1: comment: testit 1 tags: @@ -550,20 +514,18 @@ nodes: args: []string{"n01", "--comment", "This is a , comment"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodes: + inDB: `nodes: n01: comment: old comment `, - outDb: `WW_INTERNAL: 43 -nodeprofiles: {} + outDb: `nodeprofiles: {} nodes: n01: comment: This is a , comment `}, } - conf_yml := `WW_INTERNAL: 0` + conf_yml := `` tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-") assert.NoError(t, warewulfConfErr) defer os.Remove(tempWarewulfConf.Name()) @@ -588,8 +550,7 @@ func Test_Node_Add(t *testing.T) { args: []string{"--tagadd=email=node", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit tags: @@ -598,8 +559,7 @@ nodes: n01: profiles: - default`, - outDb: `WW_INTERNAL: 43 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit tags: @@ -615,8 +575,7 @@ nodes: args: []string{"--tagadd=newtag=newval", "n01"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 43 -nodeprofiles: + inDB: `nodeprofiles: default: comment: testit tags: @@ -627,8 +586,7 @@ nodes: - default tags: email: node`, - outDb: `WW_INTERNAL: 43 -nodeprofiles: + outDb: `nodeprofiles: default: comment: testit tags: diff --git a/internal/app/wwctl/overlay/imprt/main_test.go b/internal/app/wwctl/overlay/imprt/main_test.go index 8d8ef486..b78ea764 100644 --- a/internal/app/wwctl/overlay/imprt/main_test.go +++ b/internal/app/wwctl/overlay/imprt/main_test.go @@ -45,14 +45,11 @@ func Test_List(t *testing.T) { t.FailNow() } - inDb := `WW_INTERNAL: 45 -nodeprofiles: + inDb := `nodeprofiles: default: {} nodes: {} ` - conf_yml := ` -WW_INTERNAL: 0 - ` + conf_yml := `` conf := warewulfconf.New() err = conf.Parse([]byte(conf_yml)) diff --git a/internal/app/wwctl/overlay/show/main_test.go b/internal/app/wwctl/overlay/show/main_test.go index 451feb0a..e341b644 100644 --- a/internal/app/wwctl/overlay/show/main_test.go +++ b/internal/app/wwctl/overlay/show/main_test.go @@ -23,8 +23,7 @@ overlay name {{ .Overlay }} func Test_Overlay_List(t *testing.T) { env := testenv.New(t) - env.WriteFile(t, "etc/warewulf/warewulf.conf", `WW_INTERNAL: 43 -ipaddr: 192.168.0.1/24 + env.WriteFile(t, "etc/warewulf/warewulf.conf", `ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 warewulf: @@ -53,8 +52,7 @@ nfs: mount: false`) env.WriteFile(t, "etc/warewulf/nodes.conf", - `WW_INTERNAL: 45 -nodeprofiles: + `nodeprofiles: default: tags: email: admin@localhost @@ -141,8 +139,7 @@ func TestShowServerTemplate(t *testing.T) { env := testenv.New(t) env.WriteFile(t, "etc/warewulf/nodes.conf", - `WW_INTERNAL: 45 -nodeprofiles: + `nodeprofiles: default: tags: email: admin@localhost diff --git a/internal/app/wwctl/power/cycle/root_test.go b/internal/app/wwctl/power/cycle/root_test.go index 89ba118c..9e20db8f 100644 --- a/internal/app/wwctl/power/cycle/root_test.go +++ b/internal/app/wwctl/power/cycle/root_test.go @@ -15,7 +15,7 @@ func Test_PowerCycle(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/power/off/root_test.go b/internal/app/wwctl/power/off/root_test.go index 4dd31141..5dc368c8 100644 --- a/internal/app/wwctl/power/off/root_test.go +++ b/internal/app/wwctl/power/off/root_test.go @@ -15,7 +15,7 @@ func Test_Power_Status(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/power/on/root_test.go b/internal/app/wwctl/power/on/root_test.go index 82485f10..8ea62f84 100644 --- a/internal/app/wwctl/power/on/root_test.go +++ b/internal/app/wwctl/power/on/root_test.go @@ -15,7 +15,7 @@ func Test_Power_Status(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/power/reset/root_test.go b/internal/app/wwctl/power/reset/root_test.go index 131f831a..8c9a0629 100644 --- a/internal/app/wwctl/power/reset/root_test.go +++ b/internal/app/wwctl/power/reset/root_test.go @@ -15,7 +15,7 @@ func Test_Power_Status(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/power/soft/root_test.go b/internal/app/wwctl/power/soft/root_test.go index 14728692..565f2d07 100644 --- a/internal/app/wwctl/power/soft/root_test.go +++ b/internal/app/wwctl/power/soft/root_test.go @@ -15,7 +15,7 @@ func Test_Power_Status(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/power/status/root_test.go b/internal/app/wwctl/power/status/root_test.go index e7160e3e..998dee14 100644 --- a/internal/app/wwctl/power/status/root_test.go +++ b/internal/app/wwctl/power/status/root_test.go @@ -15,7 +15,7 @@ func Test_Power_Status(t *testing.T) { warewulfd.SetNoDaemon() env := testenv.New(t) defer env.RemoveAll(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 43 + env.WriteFile(t, "etc/warewulf/nodes.conf", ` nodeprofiles: default: ipmi: diff --git a/internal/app/wwctl/profile/add/main_test.go b/internal/app/wwctl/profile/add/main_test.go index b1e211ff..d0c3fb4a 100644 --- a/internal/app/wwctl/profile/add/main_test.go +++ b/internal/app/wwctl/profile/add/main_test.go @@ -23,8 +23,7 @@ func Test_Add(t *testing.T) { args: []string{"p01"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: p01: {} nodes: {} `, @@ -34,8 +33,7 @@ nodes: {} args: []string{"--netname", "primary", "--netdev", "eno3", "p02"}, wantErr: false, stdout: "", - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: p02: network devices: primary: @@ -48,8 +46,7 @@ nodes: {} warewulfd.SetNoDaemon() for _, tt := range tests { env := testenv.New(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", - `WW_INTERNAL: 45`) + env.WriteFile(t, "etc/warewulf/nodes.conf", ``) var err error t.Run(tt.name, func(t *testing.T) { baseCmd := GetCommand() diff --git a/internal/app/wwctl/profile/list/main_test.go b/internal/app/wwctl/profile/list/main_test.go index 39362f5d..da7e6a0a 100644 --- a/internal/app/wwctl/profile/list/main_test.go +++ b/internal/app/wwctl/profile/list/main_test.go @@ -29,7 +29,7 @@ PROFILE NAME COMMENT/DESCRIPTION ------------ ------------------- default -- `, - inDb: `WW_INTERNAL: 45 + inDb: ` nodeprofiles: default: {} nodes: @@ -47,7 +47,7 @@ PROFILE NAME COMMENT/DESCRIPTION default -- test -- `, - inDb: `WW_INTERNAL: 45 + inDb: ` nodeprofiles: default: {} test: {} @@ -65,7 +65,7 @@ PROFILE NAME COMMENT/DESCRIPTION ------------ ------------------- test -- `, - inDb: `WW_INTERNAL: 45 + inDb: ` nodeprofiles: default: {} test: {} @@ -84,7 +84,7 @@ PROFILE NAME COMMENT/DESCRIPTION default -- test -- `, - inDb: `WW_INTERNAL: 45 + inDb: ` nodeprofiles: default: {} test: {} @@ -96,7 +96,7 @@ nodes: }, } - conf_yml := `WW_INTERNAL: 0` + conf_yml := `` tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-") assert.NoError(t, warewulfConfErr) defer os.Remove(tempWarewulfConf.Name()) @@ -158,7 +158,7 @@ func TestListMultipleFormats(t *testing.T) { name: "single profile list yaml output", args: []string{"-y"}, output: `default: {}`, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: @@ -191,7 +191,7 @@ nodes: } } `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} nodes: @@ -207,7 +207,7 @@ nodes: default: {} test: {} `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} test: {} @@ -258,7 +258,7 @@ nodes: } } `, - inDb: `WW_INTERNAL: 43 + inDb: ` nodeprofiles: default: {} test: {} @@ -270,7 +270,7 @@ nodes: }, } - conf_yml := `WW_INTERNAL: 0` + conf_yml := `` tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-") assert.NoError(t, warewulfConfErr) defer os.Remove(tempWarewulfConf.Name()) diff --git a/internal/app/wwctl/profile/set/main_test.go b/internal/app/wwctl/profile/set/main_test.go index 538d6f0b..ef677dd3 100644 --- a/internal/app/wwctl/profile/set/main_test.go +++ b/internal/app/wwctl/profile/set/main_test.go @@ -54,13 +54,11 @@ func Test_Set_Netdev(t *testing.T) { args: []string{"--netname=default", "--netdev=eth0", "default"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: {} nodes: {} `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: network devices: default: @@ -74,13 +72,11 @@ func Test_Set_Netdev_and_Mask(t *testing.T) { args: []string{"--netname=default", "--netdev=eth0", "-M=255.255.255.0", "default"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: {} nodes: {} `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: network devices: default: @@ -96,16 +92,14 @@ func Test_Set_Mask_Existing_NetDev(t *testing.T) { args: []string{"--netname=default", "-M=255.255.255.0", "default"}, wantErr: false, stdout: "", - inDB: `WW_INTERNAL: 45 -nodeprofiles: + inDB: `nodeprofiles: default: network devices: default: device: eth0 nodes: {} `, - outDb: `WW_INTERNAL: 45 -nodeprofiles: + outDb: `nodeprofiles: default: network devices: default: diff --git a/internal/app/wwctl/root.go b/internal/app/wwctl/root.go index fb730d48..cd86b128 100644 --- a/internal/app/wwctl/root.go +++ b/internal/app/wwctl/root.go @@ -89,7 +89,7 @@ func rootPersistentPreRunE(cmd *cobra.Command, args []string) (err error) { } } if err != nil { - wwlog.Error("version: %s relase: %s WW_INTERNAL: %s", warewulfconf.Version, warewulfconf.Release, warewulfconf.Confversion) + wwlog.Error("version: %s relase: %s", warewulfconf.Version, warewulfconf.Release) return } err = conf.SetDynamicDefaults() diff --git a/internal/pkg/config/buildconfig.go.in b/internal/pkg/config/buildconfig.go.in index 560afccd..767e254a 100644 --- a/internal/pkg/config/buildconfig.go.in +++ b/internal/pkg/config/buildconfig.go.in @@ -24,9 +24,6 @@ type BuildConfig struct { const Version = "@VERSION@" const Release = "@RELEASE@" -// must be set .in file so that its available for tests -const Confversion = "45" - type TFTPConf struct { Enabled bool `yaml:"enabled" default:"true"` TftpRoot string `yaml:"tftproot" default:"@TFTPDIR@"` diff --git a/internal/pkg/config/root.go b/internal/pkg/config/root.go index 94fae599..d5db4896 100644 --- a/internal/pkg/config/root.go +++ b/internal/pkg/config/root.go @@ -26,7 +26,6 @@ var cachedConf RootConf // some information about the Warewulf server locally, and has // [WarewulfConf], [DHCPConf], [TFTPConf], and [NFSConf] sub-sections. type RootConf struct { - WWInternal int `yaml:"WW_INTERNAL"` Comment string `yaml:"comment,omitempty"` Ipaddr string `yaml:"ipaddr"` Ipaddr6 string `yaml:"ipaddr6,omitempty"` diff --git a/internal/pkg/config/root_test.go b/internal/pkg/config/root_test.go index 38104ffd..9546fb04 100644 --- a/internal/pkg/config/root_test.go +++ b/internal/pkg/config/root_test.go @@ -54,7 +54,7 @@ func TestDefaultRootConf(t *testing.T) { } func TestInitializedFromFile(t *testing.T) { - example_warewulf_conf := "WW_INTERNAL: 45" + example_warewulf_conf := "" tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-") assert.NoError(t, warewulfConfErr) defer os.Remove(tempWarewulfConf.Name()) @@ -70,7 +70,7 @@ func TestInitializedFromFile(t *testing.T) { } func TestExampleRootConf(t *testing.T) { - example_warewulf_conf := `WW_INTERNAL: 45 + example_warewulf_conf := ` ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go index 27acdcf4..e26908fc 100644 --- a/internal/pkg/node/datastructure.go +++ b/internal/pkg/node/datastructure.go @@ -17,7 +17,6 @@ const undef string = "UNDEF" Structure of which goes to disk */ type NodeYaml struct { - WWInternal int `yaml:"WW_INTERNAL,omitempty" json:"WW_INTERNAL,omitempty"` nodeProfiles map[string]*Profile nodes map[string]*Node } @@ -134,7 +133,6 @@ interface so that nodes and profiles which aren't exported will be marshaled */ type ExportedYml struct { - WWInternal int `yaml:"WW_INTERNAL"` NodeProfiles map[string]*Profile `yaml:"nodeprofiles"` Nodes map[string]*Node `yaml:"nodes"` } @@ -145,7 +143,6 @@ Marshall Exported stuff, not NodeYaml directly func (yml *NodeYaml) MarshalYAML() (interface{}, error) { wwlog.Debug("marshall yml") var exp ExportedYml - exp.WWInternal = yml.WWInternal exp.Nodes = yml.nodes exp.NodeProfiles = yml.nodeProfiles node := yaml.Node{} @@ -168,7 +165,6 @@ func (yml *NodeYaml) UnmarshalYAML( if err != nil { return } - yml.WWInternal = exp.WWInternal yml.nodes = exp.Nodes yml.nodeProfiles = exp.NodeProfiles return nil diff --git a/internal/pkg/node/hash_test.go b/internal/pkg/node/hash_test.go index 482a7ef8..637ce3d4 100644 --- a/internal/pkg/node/hash_test.go +++ b/internal/pkg/node/hash_test.go @@ -10,7 +10,6 @@ import ( func TestHash(t *testing.T) { nodeConfYml1 := ` -WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node @@ -33,7 +32,6 @@ nodes: ipaddr: 10.0.10.2 ` nodeConfYml2 := ` -WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node @@ -56,7 +54,6 @@ nodes: ipaddr: 10.0.10.1 ` nodeConfYml3 := ` -WW_INTERNAL: 45 nodeprofiles: default: comment: This profile is automatically included for each node diff --git a/internal/pkg/overlay/funcmap_test.go b/internal/pkg/overlay/funcmap_test.go index b68e3bd0..641bc50e 100644 --- a/internal/pkg/overlay/funcmap_test.go +++ b/internal/pkg/overlay/funcmap_test.go @@ -9,8 +9,7 @@ import ( ) func Test_createIgnitionJson(t *testing.T) { - node_config := `WW_INTERNAL: 45 -nodes: + node_config := `nodes: n1: disks: /dev/vda: diff --git a/internal/pkg/testenv/testenv.go b/internal/pkg/testenv/testenv.go index 94d88a83..24ab8e50 100644 --- a/internal/pkg/testenv/testenv.go +++ b/internal/pkg/testenv/testenv.go @@ -18,9 +18,8 @@ import ( "github.com/warewulf/warewulf/internal/pkg/node" ) -const initWarewulfConf = `WW_INTERNAL: 0` -const initNodesConf = `WW_INTERNAL: 45 -nodeprofiles: +const initWarewulfConf = `` +const initNodesConf = `nodeprofiles: default: {} nodes: node1: {} diff --git a/internal/pkg/testenv/testenv_test.go b/internal/pkg/testenv/testenv_test.go index 46623c96..25ea7929 100644 --- a/internal/pkg/testenv/testenv_test.go +++ b/internal/pkg/testenv/testenv_test.go @@ -19,8 +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: 45 -nodeprofiles: + env.WriteFile(t, "etc/warewulf/nodes.conf", `nodeprofiles: default: {} nodes: node1: {} diff --git a/internal/pkg/warewulfd/provision_test.go b/internal/pkg/warewulfd/provision_test.go index ba1bc977..24e3cb46 100644 --- a/internal/pkg/warewulfd/provision_test.go +++ b/internal/pkg/warewulfd/provision_test.go @@ -37,8 +37,7 @@ var provisionSendTests = []struct { func Test_ProvisionSend(t *testing.T) { env := testenv.New(t) - env.WriteFile(t, "etc/warewulf/nodes.conf", `WW_INTERNAL: 45 -nodeprofiles: + env.WriteFile(t, "etc/warewulf/nodes.conf", `nodeprofiles: default: container name: suse nodes: diff --git a/overlays/NetworkManager/internal/nodes.conf b/overlays/NetworkManager/internal/nodes.conf index fefbdbc8..33a7b4d2 100644 --- a/overlays/NetworkManager/internal/nodes.conf +++ b/overlays/NetworkManager/internal/nodes.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 45 nodes: node1: network devices: diff --git a/overlays/NetworkManager/internal/nodes_empty_mac.conf b/overlays/NetworkManager/internal/nodes_empty_mac.conf index 7f95f690..b1aa5217 100644 --- a/overlays/NetworkManager/internal/nodes_empty_mac.conf +++ b/overlays/NetworkManager/internal/nodes_empty_mac.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 45 nodes: node1: network devices: diff --git a/overlays/fstab/internal/warewulf.conf b/overlays/fstab/internal/warewulf.conf index 56d81ac5..7c5f020c 100644 --- a/overlays/fstab/internal/warewulf.conf +++ b/overlays/fstab/internal/warewulf.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 43 ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 diff --git a/overlays/host/internal/warewulf.conf b/overlays/host/internal/warewulf.conf index 56d81ac5..7c5f020c 100644 --- a/overlays/host/internal/warewulf.conf +++ b/overlays/host/internal/warewulf.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 43 ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 diff --git a/overlays/host/internal/warewulf.conf-static b/overlays/host/internal/warewulf.conf-static index 4e3207c5..cd4b744d 100644 --- a/overlays/host/internal/warewulf.conf-static +++ b/overlays/host/internal/warewulf.conf-static @@ -1,4 +1,3 @@ -WW_INTERNAL: 43 ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 diff --git a/overlays/hosts/internal/warewulf.conf b/overlays/hosts/internal/warewulf.conf index 56d81ac5..7c5f020c 100644 --- a/overlays/hosts/internal/warewulf.conf +++ b/overlays/hosts/internal/warewulf.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 43 ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 diff --git a/overlays/wwinit/internal/warewulf.conf b/overlays/wwinit/internal/warewulf.conf index 56d81ac5..7c5f020c 100644 --- a/overlays/wwinit/internal/warewulf.conf +++ b/overlays/wwinit/internal/warewulf.conf @@ -1,4 +1,3 @@ -WW_INTERNAL: 43 ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 diff --git a/overlays/wwinit/internal/wwinit_test.go b/overlays/wwinit/internal/wwinit_test.go index 0ef11229..cb51a407 100644 --- a/overlays/wwinit/internal/wwinit_test.go +++ b/overlays/wwinit/internal/wwinit_test.go @@ -57,7 +57,6 @@ func Test_wwinitOverlay(t *testing.T) { const wwinit_warewulf_conf string = `backupFile: true writeFile: true Filename: etc/warewulf/warewulf.conf -WW_INTERNAL: 43 ipaddr: 192.168.0.1/24 netmask: 255.255.255.0 network: 192.168.0.0 diff --git a/userdocs/contents/configuration.rst b/userdocs/contents/configuration.rst index b46443f6..9c0bee4b 100644 --- a/userdocs/contents/configuration.rst +++ b/userdocs/contents/configuration.rst @@ -14,7 +14,6 @@ Warewulf (4.5.2): .. code-block:: yaml - WW_INTERNAL: 45 ipaddr: 10.0.0.1 netmask: 255.255.252.0 network: 10.0.0.0 diff --git a/userdocs/contributing/development-environment-vagrant.rst b/userdocs/contributing/development-environment-vagrant.rst index 8d8944b7..cbfab328 100644 --- a/userdocs/contributing/development-environment-vagrant.rst +++ b/userdocs/contributing/development-environment-vagrant.rst @@ -190,7 +190,6 @@ Vagrantfile head.vm.provision "shell", inline: <<-SHELL cat << 'CONF' | sudo tee /etc/warewulf/warewulf.conf - WW_INTERNAL: 45 ipaddr: 192.168.200.254 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/userdocs/quickstart/debian12.rst b/userdocs/quickstart/debian12.rst index eaf4a9b8..f2692fa4 100644 --- a/userdocs/quickstart/debian12.rst +++ b/userdocs/quickstart/debian12.rst @@ -65,7 +65,6 @@ address of your cluster's private network interface: .. code-block:: yaml - WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0 diff --git a/userdocs/quickstart/el.rst b/userdocs/quickstart/el.rst index 3edc50e7..e41de7b8 100644 --- a/userdocs/quickstart/el.rst +++ b/userdocs/quickstart/el.rst @@ -58,7 +58,6 @@ address of your cluster's private network interface. .. code-block:: yaml - WW_INTERNAL: 45 ipaddr: 10.0.0.1 netmask: 255.255.252.0 network: 10.0.0.0 diff --git a/userdocs/quickstart/suse15.rst b/userdocs/quickstart/suse15.rst index a6039c7f..355f36c7 100644 --- a/userdocs/quickstart/suse15.rst +++ b/userdocs/quickstart/suse15.rst @@ -46,7 +46,6 @@ address of your cluster's private network interface: .. code-block:: yaml - WW_INTERNAL: 45 ipaddr: 192.168.200.1 netmask: 255.255.255.0 network: 192.168.200.0