diff --git a/userdocs/contents/configuration.rst b/userdocs/contents/configuration.rst index 67a22d82..4f06f6fb 100644 --- a/userdocs/contents/configuration.rst +++ b/userdocs/contents/configuration.rst @@ -147,7 +147,7 @@ may be overridden using ``warewulf.conf:paths``. * ``wwchrootdir``: The source for Warewulf images. -* ``wwprovisiondir``: Where to store built overlays, built images, and imported kernels. +* ``wwprovisiondir``: Where to store built overlays and images. * ``wwclientdir``: Where the Warewulf client looks for its configuration on a provisioned node. diff --git a/userdocs/contents/glossary.rst b/userdocs/contents/glossary.rst index 7d7bf9c5..d7d19eb6 100644 --- a/userdocs/contents/glossary.rst +++ b/userdocs/contents/glossary.rst @@ -19,8 +19,7 @@ Controller Kernel In addition to an image, Warewulf also requires a kernel (typically a Linux kernel) in order to provision a node. - Kernels may be imported independently into Warewulf, either from the controller or from an image; - however, recent versions of Warewulf (after v4.3.0) support automatically provisioning with a kernel detected and extracted from the image itself. + Warewulf (after v4.3.0) automatically provisions a kernel detected and extracted from the image itself. In most cases, kernels may be installed in the image using normal system packages, and no special consideration is necessary. Node diff --git a/userdocs/contents/ipmi.rst b/userdocs/contents/ipmi.rst index 391754b7..c10577af 100644 --- a/userdocs/contents/ipmi.rst +++ b/userdocs/contents/ipmi.rst @@ -109,7 +109,6 @@ Node View n001 discoverable -- -- n001 init -- (/sbin/init) n001 asset -- -- - n001 kerneloverride -- tw n001 kernelargs -- (quiet crashkernel=no net.ifnames=1) n001 ipmiaddr -- -- n001 ipminetmask -- -- diff --git a/userdocs/contents/nodeconfig.rst b/userdocs/contents/nodeconfig.rst index eeef4dc1..085e468f 100644 --- a/userdocs/contents/nodeconfig.rst +++ b/userdocs/contents/nodeconfig.rst @@ -93,7 +93,6 @@ You can also see the node's full attribute list by specifying the n001 discoverable -- -- n001 init -- (/sbin/init) n001 asset -- -- - n001 kerneloverride -- -- n001 kernelargs -- (quiet crashkernel=no net.ifnames=1) n001 ipmiaddr -- -- n001 ipminetmask -- -- @@ -124,12 +123,6 @@ You can also see the node's full attribute list by specifying the Setting Node Attributes ======================= -In the above output we can see that there is no kernel or image -defined for this node. To provision a node, the minimum requirements -are a kernel and image, and for that node to be useful, we will -also need to configure the network so the nodes are reachable after -they boot. - Node configurations are set using the ``wwctl node set`` command. To see a list of all configuration attributes, use the command ``wwctl node set --help``. @@ -161,7 +154,7 @@ provide the network information as follows: Are you sure you want to modify 1 nodes(s): y You can now see that the node contains configuration attributes for -image, kernel, and network: +image and network: .. code-block:: console @@ -178,7 +171,6 @@ image, kernel, and network: n001 discoverable -- -- n001 init -- (/sbin/init) n001 asset -- -- - n001 kerneloverride -- tw n001 kernelargs -- (quiet crashkernel=no net.ifnames=1) n001 ipmiaddr -- -- n001 ipminetmask -- -- diff --git a/userdocs/contents/provisioning.rst b/userdocs/contents/provisioning.rst index 66803294..719dc1ef 100644 --- a/userdocs/contents/provisioning.rst +++ b/userdocs/contents/provisioning.rst @@ -56,7 +56,7 @@ occur: #. The Warewulf server will generate the iPXE configuration which will include directions of what else is necessary to download and how to boot. - #. The kernel, image, kernel modules, and overlays + #. The kernel, image, and overlays are all downloaded over REST HTTP from the Warewulf Server #. iPXE executes the kernel and processes the overlays to provide a unified root file system @@ -84,7 +84,7 @@ through the following command : c001 RUNTIME_OVERLAY __RUNTIME__.img.gz 16 -For each node, there is 4 different stages : +For each node, there are 4 different stages : * **IPXE** * **KERNEL** diff --git a/userdocs/contents/wwctl.rst b/userdocs/contents/wwctl.rst index 16d1c7ea..c01e9632 100644 --- a/userdocs/contents/wwctl.rst +++ b/userdocs/contents/wwctl.rst @@ -7,8 +7,7 @@ Warewulf's command-line interface is based primarily around the component of Warewulf's functionality. * ``configure`` configures system services that Warewulf depends on -* ``image`` configures images (node images) -* ``kernel`` configures override kernels +* ``image`` configures (node) images * ``node`` manages nodes in the cluster * ``profiles`` defines configuration which can be applied to multiple nodes diff --git a/userdocs/contributing/development-environment-kvm.rst b/userdocs/contributing/development-environment-kvm.rst index 71f9218c..311c95f6 100644 --- a/userdocs/contributing/development-environment-kvm.rst +++ b/userdocs/contributing/development-environment-kvm.rst @@ -101,9 +101,8 @@ Build and install Warewulf on wwdev sudo wwctl configure nfs # Configure NFS exports sudo wwctl configure ssh # Build the basic ssh keys to be included by the ssh overlays - # Pull and build the image and kernel + # Pull and build the image sudo wwctl image import docker://ghcr.io/warewulf/warewulf-centos:7 centos-7 --setdefault - sudo wwctl kernel import build $(uname -r) --setdefault # Set up the default node profile sudo wwctl profile set default -K $(uname -r) -C centos-7 diff --git a/userdocs/contributing/development-environment-vbox.rst b/userdocs/contributing/development-environment-vbox.rst index 690d1fd4..e9c1315e 100644 --- a/userdocs/contributing/development-environment-vbox.rst +++ b/userdocs/contributing/development-environment-vbox.rst @@ -116,9 +116,8 @@ I have VirtualBox running on my desktop. sudo wwctl configure nfs --persist # Configure the NFS exports sudo wwctl configure ssh --persist # Build the basic ssh keys to be included by the SSH overlay - # Pull and build the image and kernel + # Pull and build the image sudo wwctl image import docker://ghcr.io/warewulf/warewulf-centos:7 centos-7 --setdefault - sudo wwctl kernel import build $(uname -r) --setdefault # Set up the default node profile sudo wwctl profile set default -K $(uname -r) -C centos-7 diff --git a/userdocs/quickstart/debian12.rst b/userdocs/quickstart/debian12.rst index b6e621f1..f67314b2 100644 --- a/userdocs/quickstart/debian12.rst +++ b/userdocs/quickstart/debian12.rst @@ -126,17 +126,16 @@ instructions. to run ``$ sudo restorecon -Rv /var/lib/tftpboot/`` if there are errors with TFTP still. -Pull and build the image (including the kernel) -=============================================== +Pull and build the image +======================== -This will pull a basic image from Docker Hub and import the -default running kernel from the controller node and set both in the -"default" node profile. +This will pull a basic image from Docker Hub +and set it for the "default" node profile. .. code-block:: bash wwctl image import docker://ghcr.io/warewulf/warewulf-debian:12.0 debian-12.0 - + wwctl profile set default --image=debian-12.0 Set up the default node profile =============================== diff --git a/userdocs/quickstart/el.rst b/userdocs/quickstart/el.rst index feb2f860..3688651b 100644 --- a/userdocs/quickstart/el.rst +++ b/userdocs/quickstart/el.rst @@ -146,9 +146,8 @@ configure --all``. Add a base node image ===================== -This will pull a basic node image from Docker Hub and import the -default running kernel from the controller node and set both in the -"default" node profile. +This will pull a basic node image from Docker Hub +and set it for the "default" node profile. .. code-block:: bash diff --git a/userdocs/quickstart/suse15.rst b/userdocs/quickstart/suse15.rst index 23e3ddda..c808e926 100644 --- a/userdocs/quickstart/suse15.rst +++ b/userdocs/quickstart/suse15.rst @@ -109,16 +109,16 @@ instructions. sudo wwctl configure --all -Pull and build the image and kernel -=================================== +Pull and build the image +======================== -This will pull a basic image from Docker Hub and import the -default running kernel from the controller node and set both in the -"default" node profile. +This will pull a basic image from Docker Hub +and set it in the "default" node profile. .. code-block:: bash - $ sudo wwctl image import docker://registry.opensuse.org/science/warewulf/leap-15.4/images/kernel:latest leap15.4 --setdefault + $ sudo wwctl image import docker://registry.opensuse.org/science/warewulf/leap-15.4/containers/kernel:latest leap15.4 + $ sudo wwctl profile set default --image leap15.4 Set up the default node profile ===============================