From 29047d22b76ac70a8d9b0a3b45590bb5feaf245f Mon Sep 17 00:00:00 2001 From: Troy Caro Date: Sun, 19 Nov 2023 18:15:42 -0500 Subject: [PATCH 1/4] Update warewulf.conf in quickstart to match copy in development branch Signed-off-by: Troy Caro --- userdocs/quickstart/el7.rst | 56 +++++++++++++++++++++++-------------- userdocs/quickstart/el8.rst | 56 +++++++++++++++++++++++-------------- userdocs/quickstart/el9.rst | 56 +++++++++++++++++++++++-------------- 3 files changed, 105 insertions(+), 63 deletions(-) diff --git a/userdocs/quickstart/el7.rst b/userdocs/quickstart/el7.rst index c5859d56..c9c43692 100644 --- a/userdocs/quickstart/el7.rst +++ b/userdocs/quickstart/el7.rst @@ -38,27 +38,41 @@ address of your cluster's private network interface: .. code-block:: yaml - ipaddr: 192.168.200.1 - netmask: 255.255.255.0 - warewulf: - port: 9873 - secure: false - update interval: 60 - dhcp: - enabled: true - range start: 192.168.200.10 - range end: 192.168.200.99 - template: default - systemd name: dhcpd - tftp: - enabled: true - tftproot: /var/lib/tftpboot - systemd name: tftp - nfs: - systemd name: nfs-server - exports: - - /home - - /var/warewulf + WW_INTERNAL: 43 + ipaddr: 192.168.200.1 + netmask: 255.255.255.0 + network: 192.168.200.0 + warewulf: + port: 9873 + secure: false + update interval: 60 + autobuild overlays: true + host overlay: true + syslog: false + dhcp: + enabled: true + range start: 192.168.200.50 + range end: 192.168.200.99 + systemd name: dhcpd + tftp: + enabled: true + systemd name: tftp + nfs: + enabled: true + export paths: + - path: /home + export options: rw,sync + mount options: defaults + mount: true + - path: /opt + export options: ro,sync,no_root_squash + mount options: defaults + mount: false + systemd name: nfs-server + container mounts: + - source: /etc/resolv.conf + dest: /etc/resolv.conf + readonly: true .. note:: diff --git a/userdocs/quickstart/el8.rst b/userdocs/quickstart/el8.rst index 31b97be0..13a29d93 100644 --- a/userdocs/quickstart/el8.rst +++ b/userdocs/quickstart/el8.rst @@ -57,27 +57,41 @@ address of your cluster's private network interface: .. code-block:: yaml - ipaddr: 192.168.200.1 - netmask: 255.255.255.0 - warewulf: - port: 9873 - secure: false - update interval: 60 - dhcp: - enabled: true - range start: 192.168.200.10 - range end: 192.168.200.99 - template: default - systemd name: dhcpd - tftp: - enabled: true - tftproot: /var/lib/tftpboot - systemd name: tftp - nfs: - systemd name: nfs-server - exports: - - /home - - /var/warewulf + WW_INTERNAL: 43 + ipaddr: 192.168.200.1 + netmask: 255.255.255.0 + network: 192.168.200.0 + warewulf: + port: 9873 + secure: false + update interval: 60 + autobuild overlays: true + host overlay: true + syslog: false + dhcp: + enabled: true + range start: 192.168.200.50 + range end: 192.168.200.99 + systemd name: dhcpd + tftp: + enabled: true + systemd name: tftp + nfs: + enabled: true + export paths: + - path: /home + export options: rw,sync + mount options: defaults + mount: true + - path: /opt + export options: ro,sync,no_root_squash + mount options: defaults + mount: false + systemd name: nfs-server + container mounts: + - source: /etc/resolv.conf + dest: /etc/resolv.conf + readonly: true .. note:: diff --git a/userdocs/quickstart/el9.rst b/userdocs/quickstart/el9.rst index d8a223f5..eccbf2be 100644 --- a/userdocs/quickstart/el9.rst +++ b/userdocs/quickstart/el9.rst @@ -57,27 +57,41 @@ address of your cluster's private network interface: .. code-block:: yaml - ipaddr: 192.168.200.1 - netmask: 255.255.255.0 - warewulf: - port: 9873 - secure: false - update interval: 60 - dhcp: - enabled: true - range start: 192.168.200.10 - range end: 192.168.200.99 - template: default - systemd name: dhcpd - tftp: - enabled: true - tftproot: /var/lib/tftpboot - systemd name: tftp - nfs: - systemd name: nfs-server - exports: - - /home - - /var/warewulf + WW_INTERNAL: 43 + ipaddr: 192.168.200.1 + netmask: 255.255.255.0 + network: 192.168.200.0 + warewulf: + port: 9873 + secure: false + update interval: 60 + autobuild overlays: true + host overlay: true + syslog: false + dhcp: + enabled: true + range start: 192.168.200.50 + range end: 192.168.200.99 + systemd name: dhcpd + tftp: + enabled: true + systemd name: tftp + nfs: + enabled: true + export paths: + - path: /home + export options: rw,sync + mount options: defaults + mount: true + - path: /opt + export options: ro,sync,no_root_squash + mount options: defaults + mount: false + systemd name: nfs-server + container mounts: + - source: /etc/resolv.conf + dest: /etc/resolv.conf + readonly: true .. note:: From b9c60c1ae2e14cef87af9e0e5304b32ccac51efc Mon Sep 17 00:00:00 2001 From: Troy Caro Date: Sun, 19 Nov 2023 18:17:15 -0500 Subject: [PATCH 2/4] Fix container name in el9 quickstart Signed-off-by: Troy Caro --- userdocs/quickstart/el9.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdocs/quickstart/el9.rst b/userdocs/quickstart/el9.rst index eccbf2be..b3db476f 100644 --- a/userdocs/quickstart/el9.rst +++ b/userdocs/quickstart/el9.rst @@ -151,7 +151,7 @@ the ``default`` node profile: .. code-block:: bash - sudo wwctl profile set --yes --container rocky-8 "default" + sudo wwctl profile set --yes --container rocky-9 "default" Next we set some default networking configurations for the first ethernet device. On modern Linux distributions, the name of the device From 7ee74a2fc84018dce082b34ef3094a551d74626b Mon Sep 17 00:00:00 2001 From: Troy Caro Date: Sun, 19 Nov 2023 18:21:07 -0500 Subject: [PATCH 3/4] Update warewulf.conf in SUSE quickstart to match copy in development branch Signed-off-by: Troy Caro --- userdocs/quickstart/suse15.rst | 65 ++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/userdocs/quickstart/suse15.rst b/userdocs/quickstart/suse15.rst index d7948d7d..b50bad39 100644 --- a/userdocs/quickstart/suse15.rst +++ b/userdocs/quickstart/suse15.rst @@ -46,36 +46,41 @@ address of your cluster's private network interface: .. code-block:: yaml - ipaddr: 192.168.200.1 - netmask: 255.255.255.0 - warewulf: - port: 9873 - secure: false - update interval: 60 - autobuild overlays: true - host overlay: true - dhcp: - enabled: true - range start: 192.168.200.10 - range end: 192.168.200.99 - template: default - systemd name: dhcpd - tftp: - enabled: true - tftproot: /var/lib/tftpboot - systemd name: tftp - nfs: - enabled: true - export paths: - - path: /home - export options: rw,sync - mount options: defaults - mount: true - - path: /opt - export options: ro,sync,no_root_squash - mount options: defaults - mount: false - systemd name: nfs-server + WW_INTERNAL: 43 + ipaddr: 192.168.200.1 + netmask: 255.255.255.0 + network: 192.168.200.0 + warewulf: + port: 9873 + secure: false + update interval: 60 + autobuild overlays: true + host overlay: true + syslog: false + dhcp: + enabled: true + range start: 192.168.200.50 + range end: 192.168.200.99 + systemd name: dhcpd + tftp: + enabled: true + systemd name: tftp + nfs: + enabled: true + export paths: + - path: /home + export options: rw,sync + mount options: defaults + mount: true + - path: /opt + export options: ro,sync,no_root_squash + mount options: defaults + mount: false + systemd name: nfs-server + container mounts: + - source: /etc/resolv.conf + dest: /etc/resolv.conf + readonly: true .. note:: From 9b5f0f23045f63f5e3f021a948838831c4229e83 Mon Sep 17 00:00:00 2001 From: Troy Caro Date: Sun, 19 Nov 2023 19:08:08 -0500 Subject: [PATCH 4/4] Have the add node syntax use long flags and more consistent with all quickstarts Signed-off-by: Troy Caro --- userdocs/quickstart/el7.rst | 4 ++-- userdocs/quickstart/el8.rst | 2 +- userdocs/quickstart/suse15.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/userdocs/quickstart/el7.rst b/userdocs/quickstart/el7.rst index c9c43692..72894b7c 100644 --- a/userdocs/quickstart/el7.rst +++ b/userdocs/quickstart/el7.rst @@ -139,7 +139,7 @@ configuration, we can set them in the default profile as follows: .. code-block:: bash - sudo wwctl profile set -y default --netname default --netmask 255.255.255.0 --gateway 192.168.200.1 + sudo wwctl profile set -y default --netdev eth0 --netmask 255.255.255.0 --gateway 192.168.200.1 sudo wwctl profile list Add a node @@ -159,7 +159,7 @@ configurations. .. code-block:: bash - sudo wwctl node add n0000.cluster --netname default -I 192.168.200.100 --discoverable + sudo wwctl node add n0000.cluster --ipaddr 192.168.200.100 --discoverable true sudo wwctl node list -a n0000 Turn on your compute node and watch it boot! diff --git a/userdocs/quickstart/el8.rst b/userdocs/quickstart/el8.rst index 13a29d93..b99e9868 100644 --- a/userdocs/quickstart/el8.rst +++ b/userdocs/quickstart/el8.rst @@ -187,7 +187,7 @@ configurations. .. code-block:: bash - sudo wwctl node add n0000.cluster --ipaddr 192.168.200.100 --discoverable + sudo wwctl node add n0000.cluster --ipaddr 192.168.200.100 --discoverable true At this point you can view the basic configuration of this node by typing the following: diff --git a/userdocs/quickstart/suse15.rst b/userdocs/quickstart/suse15.rst index b50bad39..58a7e330 100644 --- a/userdocs/quickstart/suse15.rst +++ b/userdocs/quickstart/suse15.rst @@ -164,7 +164,7 @@ configurations. .. code-block:: bash - sudo wwctl node add n0000.cluster --netdev eth0 -I 192.168.200.100 --discoverable + sudo wwctl node add n0000.cluster --netdev eth0 --ipaddr 192.168.200.100 --discoverable true sudo wwctl node list -a n0000.cluster Warewulf Overlays