From 2b99b44c35d14674ac39d17f2c095c35b08b7467a4046980138a1465b842e78d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 16 Jan 2023 09:44:28 +0000 Subject: [PATCH 1/5] Accepting request 1056234 from home:mslacken:pr - updated to version v0.4.4 with following changes: * Changed internal interacation between the on disk YAML format and the in memory format. This enables the command line options to be autogenerated from the datastructures. Also this keeps the options for profiles and node set/add commands in strict sync. * Added node edit/export/import where the edit command exposes the YAML config for the given nodes in an editor. Nodes can also be added with this command. The export command simply drops the YAML config for the given nodes. With the import command nodes can be imported as YAML or as a CSV file. The CSV file must havr a header in where the first field must always be the nodename, the rest of the fields are the same as the long commandline options. Network device must have the form net.$NETNAME.$NETOPTION, which would e.g. be net.default.ipaddr * The default value (like kernel args) are no read in from the configuration file defaults.conf. If this file couldn't be read built in default values will be used. * Template files for NetworkManager are now present in the wwinit overlay. A interface must have the type ethernet or infiniband that these will be brought up by NetworkManager * Listings of container via wwctl container list will now show the creation,modification date and the size. * Initial cut of the warewulf API. OBS-URL: https://build.opensuse.org/request/show/1056234 OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=17 --- vendor.tar.gz | 4 ++-- warewulf4-v4.3.0.tar.gz | 3 --- warewulf4-v4.4.0.tar.gz | 3 +++ warewulf4.changes | 22 ++++++++++++++++++++++ warewulf4.spec | 34 ++++++++++++++++++++++++---------- 5 files changed, 51 insertions(+), 15 deletions(-) delete mode 100644 warewulf4-v4.3.0.tar.gz create mode 100644 warewulf4-v4.4.0.tar.gz diff --git a/vendor.tar.gz b/vendor.tar.gz index 66d7bf0..8f6870e 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7f581d6646f04eaca87287ff924a728e345cbcf331e4f9972990276cb7a5840 -size 4839581 +oid sha256:8842e76c0269092bec395d839e4b0484da961377fad2f341feb8b015755716de +size 5197800 diff --git a/warewulf4-v4.3.0.tar.gz b/warewulf4-v4.3.0.tar.gz deleted file mode 100644 index b71a5ef..0000000 --- a/warewulf4-v4.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1e8024eced67604f11e219afcc3a755a3c422c160b40b252f0db1b6a52de425 -size 1261900 diff --git a/warewulf4-v4.4.0.tar.gz b/warewulf4-v4.4.0.tar.gz new file mode 100644 index 0000000..bbf8a42 --- /dev/null +++ b/warewulf4-v4.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc206a9bf9359a5a69a04ff8ad061af315b79c72ef4e3c2ab4822ea1f6edec6e +size 1477824 diff --git a/warewulf4.changes b/warewulf4.changes index a970fac..c82e758 100644 --- a/warewulf4.changes +++ b/warewulf4.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Jan 5 16:08:19 UTC 2023 - Christian Goll + +- updated to version v0.4.4 with following changes: + * Changed internal interacation between the on disk YAML format and the in memory + format. This enables the command line options to be autogenerated from the datastructures. + Also this keeps the options for profiles and node set/add commands in strict sync. + * Added node edit/export/import where the edit command exposes the YAML config for the + given nodes in an editor. Nodes can also be added with this command. The export command + simply drops the YAML config for the given nodes. With the import command nodes can be + imported as YAML or as a CSV file. The CSV file must havr a header in where the first field + must always be the nodename, the rest of the fields are the same as the long commandline + options. Network device must have the form net.$NETNAME.$NETOPTION, which would e.g. be + net.default.ipaddr + * The default value (like kernel args) are no read in from the configuration file + defaults.conf. If this file couldn't be read built in default values will be used. + * Template files for NetworkManager are now present in the wwinit overlay. A interface must + have the type ethernet or infiniband that these will be brought up by NetworkManager + * Listings of container via wwctl container list will now show the creation,modification + date and the size. + * Initial cut of the warewulf API. + ------------------------------------------------------------------- Tue Jun 21 14:44:06 UTC 2022 - Christian Goll diff --git a/warewulf4.spec b/warewulf4.spec index cad618d..20b0366 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -1,7 +1,7 @@ # # spec file for package warewulf4 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,18 @@ # +%define rc rc3 + ExclusiveArch: x86_64 aarch64 Name: warewulf4 -Version: 4.3.0 +Version: 4.4.0 Release: 0 Summary: A suite of tools for clustering License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://warewulf.org -Source0: https://github.com/hpcng/warewulf/archive/v%{version}.tar.gz#/warewulf4-v%{version}.tar.gz +Source0: https://github.com/hpcng/warewulf/archive/v%{version}%{?rc}.tar.gz#/warewulf4-v%{version}.tar.gz Source1: vendor.tar.gz Source3: warewulf4-rpmlintrc @@ -66,6 +68,14 @@ Group: Productivity/Clustering/Computing %description overlay Includes the default overlays so that they can be updated seprately. +%package api +Requires: %{name} +Summary: Contains the service for the warewulf rest API +BuildArch: noarch + +%description api +Containts the binaries for the access of warewulf through a rest API and from the commandline from an external host. + %package ipxe Requires: tftp Summary: Binaries of iPXE for ww4 installation @@ -85,7 +95,7 @@ This package install the necessary configuration files in order to run a slurm cluster on the configured warewulf nodes. %prep -%setup -q -n warewulf-%{version} +%setup -q -n warewulf-%{version}%{?rc} # extract the vendor stuff tar xzf %{S:1} %autopatch -p1 @@ -167,11 +177,10 @@ EOF %attr(0755, root, warewulf) %dir %{_sysconfdir}/warewulf/ipxe %{_datadir}/bash-completion/completions/wwctl %{_mandir}/man1/wwctl*1.gz +%{_mandir}/man5/*conf*gz %config(noreplace) %{_sysconfdir}/warewulf/nodes.conf %config(noreplace) %{_sysconfdir}/warewulf/warewulf.conf -#%config(noreplace) %{_sysconfdir}/warewulf/wwapic.conf -#%config(noreplace) %{_sysconfdir}/warewulf/wwapid.conf -#%config(noreplace) %{_sysconfdir}/warewulf/wwapird.conf +%config(noreplace) %{_sysconfdir}/warewulf/defaults.conf %config(noreplace) %{_sysconfdir}/warewulf/ipxe/*.ipxe %{_sysconfdir}/warewulf/examples @@ -179,9 +188,6 @@ EOF %{_localstatedir}/lib/warewulf %exclude %{_localstatedir}/lib/warewulf/overlays %{_bindir}/wwctl -#%{_bindir}/wwapic -#%{_bindir}/wwapid -#%{_bindir}/wwapird %{_sbindir}/rcwarewulfd %{_unitdir}/warewulfd.service %{_sysusersdir}/system-user-%{name}.conf @@ -199,6 +205,14 @@ EOF #/srv/tftpboot/warewulf %{_datadir}/warewulf +%files api +%{_bindir}/wwapic +%{_bindir}/wwapid +%{_bindir}/wwapird +%config(noreplace) %{_sysconfdir}/warewulf/wwapic.conf +%config(noreplace) %{_sysconfdir}/warewulf/wwapid.conf +%config(noreplace) %{_sysconfdir}/warewulf/wwapird.conf + %files slurm %dir %{_localstatedir}/lib/warewulf/overlays/host/etc/slurm %{_localstatedir}/lib/warewulf/overlays/host/etc/slurm/slurm.conf.ww From 08012e145bccea765d3a4256f5f1a66ea509285595803015ae71395677480ea3 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 16 Jan 2023 09:50:51 +0000 Subject: [PATCH 2/5] - Fix define OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=18 --- warewulf4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warewulf4.spec b/warewulf4.spec index 20b0366..b5ecb30 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -16,7 +16,7 @@ # -%define rc rc3 +%define %rc rc3 ExclusiveArch: x86_64 aarch64 From ea19fbd38e48e5edfe83e0feae52f69ffe8f529715d399fd9102914e9a3e926c Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 16 Jan 2023 09:56:44 +0000 Subject: [PATCH 3/5] - Fix rc version again OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=19 --- warewulf4.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/warewulf4.spec b/warewulf4.spec index b5ecb30..9729f34 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -16,7 +16,7 @@ # -%define %rc rc3 +%define rc_v rc3 ExclusiveArch: x86_64 aarch64 @@ -27,7 +27,7 @@ Summary: A suite of tools for clustering License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://warewulf.org -Source0: https://github.com/hpcng/warewulf/archive/v%{version}%{?rc}.tar.gz#/warewulf4-v%{version}.tar.gz +Source0: https://github.com/hpcng/warewulf/archive/v%{version}%{?rc_v}.tar.gz#/warewulf4-v%{version}.tar.gz Source1: vendor.tar.gz Source3: warewulf4-rpmlintrc @@ -95,7 +95,7 @@ This package install the necessary configuration files in order to run a slurm cluster on the configured warewulf nodes. %prep -%setup -q -n warewulf-%{version}%{?rc} +%setup -q -n warewulf-%{version}%{?rc_v} # extract the vendor stuff tar xzf %{S:1} %autopatch -p1 From 709a7770e76956a68b69f254eef08d7d60308d8b8f450a5ad1d6cea24dcd77c5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 16 Jan 2023 10:31:52 +0000 Subject: [PATCH 4/5] Accepting request 1058664 from home:eeich:branches:network:cluster - Do not set API package to noarch as it contains binaries. OBS-URL: https://build.opensuse.org/request/show/1058664 OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=20 --- warewulf4.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/warewulf4.spec b/warewulf4.spec index 9729f34..53388b9 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -71,7 +71,6 @@ Includes the default overlays so that they can be updated seprately. %package api Requires: %{name} Summary: Contains the service for the warewulf rest API -BuildArch: noarch %description api Containts the binaries for the access of warewulf through a rest API and from the commandline from an external host. From b90fe3bfc34fee0a891bb2989d5bf9453eab3697b93444eb02d3532624e04e48 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 19 Jan 2023 11:33:09 +0000 Subject: [PATCH 5/5] - Update to 4.4.0 with following changes: * chroots and overlays moved from /var/lib to /usr/share * all boolean options need now to have the form --option=true|false e.g. wwctl node set node01 --discoverable=true * wwctl show --render shows overlay templates as they would be rendered on a given target node - updated to version v4.4.0 with following changes: * Changed internal interacation between the on disk YAML format and the in memory format. This enables the command line options to be autogenerated from the datastructures. Also this keeps the options for profiles and node set/add commands in strict sync. * Added node edit/export/import where the edit command exposes the YAML config for the given nodes in an editor. Nodes can also be added with this command. The export command simply drops the YAML config for the given nodes. With the import command nodes can be imported as YAML or as a CSV file. The CSV file must havr a header in where the first field must always be the nodename, the rest of the fields are the same as the long commandline options. Network device must have the form net.$NETNAME.$NETOPTION, which would e.g. be net.default.ipaddr * The default value (like kernel args) are no read in from the configuration file defaults.conf. If this file couldn't be read built in default values will be used. * Template files for NetworkManager are now present in the wwinit overlay. A interface must have the type ethernet or infiniband that these will be brought up by NetworkManager * Listings of container via wwctl container list will now show the creation,modification date and the size. * Initial cut of the warewulf API. OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=21 --- vendor.tar.gz | 4 ++-- warewulf4-v4.4.0.tar.gz | 4 ++-- warewulf4.changes | 12 +++++++++++- warewulf4.spec | 21 +++++++++++---------- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/vendor.tar.gz b/vendor.tar.gz index 8f6870e..3a1daec 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8842e76c0269092bec395d839e4b0484da961377fad2f341feb8b015755716de -size 5197800 +oid sha256:125a8ddea4052c3dd9e41407861e347c91e56ff5edf0b6beb2aa4177f38772f7 +size 5415888 diff --git a/warewulf4-v4.4.0.tar.gz b/warewulf4-v4.4.0.tar.gz index bbf8a42..8de7925 100644 --- a/warewulf4-v4.4.0.tar.gz +++ b/warewulf4-v4.4.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc206a9bf9359a5a69a04ff8ad061af315b79c72ef4e3c2ab4822ea1f6edec6e -size 1477824 +oid sha256:1cfe0dddcafdc7ea0fa36b2fcd0105962b8d0bd62870641b7c35efb938aed489 +size 1479705 diff --git a/warewulf4.changes b/warewulf4.changes index c82e758..8dd6d97 100644 --- a/warewulf4.changes +++ b/warewulf4.changes @@ -1,7 +1,17 @@ +------------------------------------------------------------------- +Thu Jan 19 11:13:58 UTC 2023 - Christian Goll + +- Update to 4.4.0 with following changes: + * chroots and overlays moved from /var/lib to /usr/share + * all boolean options need now to have the form --option=true|false + e.g. wwctl node set node01 --discoverable=true + * wwctl show --render shows overlay templates as they would be + rendered on a given target node + ------------------------------------------------------------------- Thu Jan 5 16:08:19 UTC 2023 - Christian Goll -- updated to version v0.4.4 with following changes: +- updated to version v4.4.0 with following changes: * Changed internal interacation between the on disk YAML format and the in memory format. This enables the command line options to be autogenerated from the datastructures. Also this keeps the options for profiles and node set/add commands in strict sync. diff --git a/warewulf4.spec b/warewulf4.spec index 53388b9..658f741 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -16,7 +16,7 @@ # -%define rc_v rc3 +#%%define rls_cndt rc3 ExclusiveArch: x86_64 aarch64 @@ -27,9 +27,10 @@ Summary: A suite of tools for clustering License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://warewulf.org -Source0: https://github.com/hpcng/warewulf/archive/v%{version}%{?rc_v}.tar.gz#/warewulf4-v%{version}.tar.gz +Source0: https://github.com/hpcng/warewulf/archive/v%{version}%{?rls_cndt}.tar.gz#/warewulf4-v%{version}.tar.gz Source1: vendor.tar.gz Source3: warewulf4-rpmlintrc +#Patch1: upstream.patch # no firewalld in sle12 %if 0%{?sle_version} >= 150000 || 0%{?suse_version} > 1500 @@ -44,8 +45,8 @@ BuildRequires: munge BuildRequires: sysuser-tools BuildRequires: tftp BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-ipxe -Requires: %{name}-overlay +Requires: %{name}-ipxe = %{version} +Requires: %{name}-overlay = %{version} Requires: dhcp-server Requires: ipmitool Requires: nfs-kernel-server @@ -94,7 +95,7 @@ This package install the necessary configuration files in order to run a slurm cluster on the configured warewulf nodes. %prep -%setup -q -n warewulf-%{version}%{?rc_v} +%setup -q -n warewulf-%{version}%{?rls_cndt} # extract the vendor stuff tar xzf %{S:1} %autopatch -p1 @@ -106,7 +107,7 @@ make %{?_smp_mflags} genconfig \ BINDIR=%{_bindir} \ SYSCONFDIR=%{_sysconfdir} \ DATADIR=%{_datadir} \ - LOCALSTATEDIR=%{_sharedstatedir} \ + LOCALSTATEDIR=%{_datadir} \ SHAREDSTATEDIR=%{_sharedstatedir} \ MANDIR=%{_mandir} \ INFODIR=%{_infodir} \ @@ -124,10 +125,10 @@ export NO_BRP_STALE_LINK_ERROR=yes %{makeinstall} # cleanup -mv %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcp/dhcpd.conf.ww \ - %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcpd.conf.ww -rmdir %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcp -rm %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcpd.conf +mv %{buildroot}%{_datadir}/warewulf/overlays/host/etc/dhcp/dhcpd.conf.ww \ + %{buildroot}%{_datadir}//warewulf/overlays/host/etc/dhcpd.conf.ww +rmdir %{buildroot}%{_datadir}/warewulf/overlays/host/etc/dhcp +rm %{buildroot}%{_datadir}/warewulf/overlays/host/etc/dhcpd.conf mkdir -p %{buildroot}%{_sbindir}/ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcwarewulfd mkdir -p %{buildroot}%{_datadir}/bash-completion/completions