diff --git a/admin-guide/deployment/sample.rst b/admin-guide/deployment/sample.rst index ad8d69a8..b3944113 100644 --- a/admin-guide/deployment/sample.rst +++ b/admin-guide/deployment/sample.rst @@ -11,7 +11,7 @@ The informations we need are: - the server name: ``logging-ra.psi.ch`` - the server MAC address: ``23:3d:ef:33:11:22`` - static or dynamic IP: ``static`` - - the OS installer: ``rhel79server`` + - the OS installer: ``rhel8install`` - the server role: ``role::logging_server`` - the server environment in puppet: ``prod`` - the sysdb environment: ``daas`` @@ -50,7 +50,7 @@ Next decide how the IP address is configured (``dhcp`` or ``static``): :: And which installer is used: :: - bob node set-attr syslog-ra.psi.ch ipxe_installer=rhel79server + bob node set-attr syslog-ra.psi.ch ipxe_installer=rhel8install And we finally setup the puppet role and puppet environment: :: @@ -66,7 +66,7 @@ Full example: :: bob node add lx-test-02.psi.ch pli netboot bob node add-mac lx-test-02 00:50:56:9d:19:76 - bob node set-attr lx-test-02.psi.ch ipxe_installer=rhel87install + bob node set-attr lx-test-02.psi.ch ipxe_installer=rhel8install bob node set-attr lx-test-02.psi.ch puppet_env=prod bob node set-attr lx-test-02.psi.ch puppet_group=default bob node set-attr lx-test-02.psi.ch puppet_role=role::server diff --git a/admin-guide/mgmt-tools/bob.rst b/admin-guide/mgmt-tools/bob.rst index 04044b9f..575a1b69 100644 --- a/admin-guide/mgmt-tools/bob.rst +++ b/admin-guide/mgmt-tools/bob.rst @@ -17,7 +17,7 @@ The following attributes can be set for a node: +========================+==================+===========+================================================================================+ | ``iface`` | ``enp225s0f0`` | no | the installation entry to use for automatic installation | +------------------------+------------------+-----------+--------------------------------------------------------------------------------+ -| ``ipxe_installer`` | ``rhel87install``| no | the installation entry to use for automatic installation (``netboot``) | +| ``ipxe_installer`` | ``rhel8install`` | no | the installation entry to use for automatic installation (``netboot``) | +------------------------+------------------+-----------+--------------------------------------------------------------------------------+ | ``network`` | ``static`` | no | network setup of the installed system; can be ``static`` or ``dhcp`` (default) | +------------------------+------------------+-----------+--------------------------------------------------------------------------------+ diff --git a/admin-guide/operations/deployment.rst b/admin-guide/operations/deployment.rst index 91e53743..4693834a 100644 --- a/admin-guide/operations/deployment.rst +++ b/admin-guide/operations/deployment.rst @@ -36,7 +36,7 @@ node:: Finally we need to configure the installer to use, and the Puppet-related parameters:: - bob node set-attr $FQDN ipxe_installer=rhel79server + bob node set-attr $FQDN ipxe_installer=rhel8install bob node set-attr $FQDN network=static bob node set-attr $FQDN puppet_env=prod bob node set-attr $FQDN puppet_role=role::server diff --git a/infrastructure-guide/influx00.md b/infrastructure-guide/influx00.md index e6b2e6eb..44552e8d 100644 --- a/infrastructure-guide/influx00.md +++ b/infrastructure-guide/influx00.md @@ -117,7 +117,7 @@ Is it this one: https://git.psi.ch/linux-infra/puppet/blob/preprod/code/modules/ - Correct ``` [klart@klart ~]$ bob node list -v influx00.psi.ch -influx00.psi.ch pli local ipxe_installer=rhel73server network=static puppet_env=pmons puppet_role=role::influxdb +influx00.psi.ch pli local ipxe_installer=rhel7install network=static puppet_env=pmons puppet_role=role::influxdb ``` - The influx service seems to be started by systemd, however it seems that the systemd service file does not come with a package - was this one placed manually there? diff --git a/rhel8/installation.md b/rhel8/installation.md index d21924df..74801386 100644 --- a/rhel8/installation.md +++ b/rhel8/installation.md @@ -8,11 +8,11 @@ The machine you want to install needs to be [registered in `sysdb`](../admin-guide/deployment/sample). -Optional you can set `netboot` and RHEL 8.7 installer but that can also be selected manually in be boot menu: +Optional you can set `netboot` and RHEL 8 installer but that can also be selected manually in be boot menu: ``` bob node netboot $FQDN -bob node set-attr $FQDN ipxe_installer=rhel87install +bob node set-attr $FQDN ipxe_installer=rhel8install ``` ### Installation with UEFI Start the machine and select network boot (if not already the default), then you get following menu: @@ -38,15 +38,7 @@ Boot0004* Red Hat Enterprise Linux (there is no need to have the leading 000 ) ### Installation with Legacy BIOS -Start the machine and select network boot (if not already the default), then you get following menu: -![PXE default menu](installation/pxe_default.png) - -There select "Red Hat Enterprise Linux 7 Network Install Menu" to get into the iPXE menu, where you can do also a lot of other stuff. -![PXE menu selection for iPXE](installation/pxe_select.png) -(I plan to get rid of above menu as it also breaks automatic installation by `sysdb` configuration). - -The iPXE menu is then generated according to `sysdb` and its default depends on the configuration, there, but you may override it manualy: -![iPXE menu with local boot default](installation/ipxe_default.png) +Start the machine and select network boot (if not already the default), then you get following menu, where the default depends on the `sysdb` configuration, but you may override it manualy: ![select RHEL 8 installation](installation/ipxe_select_rhel8.png) diff --git a/rhel8/installation/ipxe_default.png b/rhel8/installation/ipxe_default.png deleted file mode 100644 index 33190aaa..00000000 Binary files a/rhel8/installation/ipxe_default.png and /dev/null differ diff --git a/rhel8/installation/pxe_default.png b/rhel8/installation/pxe_default.png deleted file mode 100644 index 9abde802..00000000 Binary files a/rhel8/installation/pxe_default.png and /dev/null differ diff --git a/rhel8/installation/pxe_select.png b/rhel8/installation/pxe_select.png deleted file mode 100644 index ae15942d..00000000 Binary files a/rhel8/installation/pxe_select.png and /dev/null differ