diff --git a/CHANGELOG.md b/CHANGELOG.md index 316788cc27a..862b72eaf8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Improved procedure formatting for better clarity in Administration + Guide (bsc#1253660) - Added links to man pages for createrepo_c and reprepro to Administration Guide (bsc#1237181) - Added missing options to command example in Installation and diff --git a/modules/administration/pages/troubleshooting/tshoot-registerclones.adoc b/modules/administration/pages/troubleshooting/tshoot-registerclones.adoc index de77e6cd9e1..a4d011a2e65 100644 --- a/modules/administration/pages/troubleshooting/tshoot-registerclones.adoc +++ b/modules/administration/pages/troubleshooting/tshoot-registerclones.adoc @@ -43,21 +43,23 @@ This procedure does not manipulate the original client, which remains registered .Procedure: Resolving Duplicate Machine IDs in Cloned Salt Clients [role=procedure] -_____ +____ . *Initial System Configuration* -. On the cloned machine, change the hostname and IP addresses. +.. On the cloned machine, change the hostname and IP addresses. Make sure [path]``/etc/hosts`` contains the changes you made and the correct host entries. . *Resolving Duplicate Machine IDs* -. _For distributions that support systemd:_ - If your machines have the same machine ID, as root, delete the files on each duplicated client and re-create it: +.. _For distributions that support systemd:_ + +... If your machines have the same machine ID, as root, delete the files on each duplicated client and re-create it: + + ---- rm /etc/machine-id rm /var/lib/dbus/machine-id @@ -66,8 +68,9 @@ dbus-uuidgen --ensure systemd-machine-id-setup ---- -. If the cloned machine also has a folder in [path]``/var/log/journal/`` it needs to be renamed accordingly to the new machine ID. -If names do not match, [command]``journalctl`` could not retrieve any log and [command]``podman logs`` would not show anything. ++ + +... If the cloned machine also has a folder in [path]``/var/log/journal/`` it needs to be renamed accordingly to the new machine ID. If names do not match, [command]``journalctl`` could not retrieve any log and [command]``podman logs`` would not show anything. + @@ -75,8 +78,11 @@ If names do not match, [command]``journalctl`` could not retrieve any log and [c mv /var/log/journal/* /var/log/journal/$(cat /etc/machine-id) ---- -. _For distributions that do not support systemd:_ - As root, generate a machine ID from dbus: ++ + +.. _For distributions that do not support systemd:_ + +... As root, generate a machine ID from dbus: + @@ -86,36 +92,38 @@ rm /var/lib/zypp/AnonymousUniqueId dbus-uuidgen --ensure ---- -. *Fixing Kernel Entries on {rhel} 8.10* - -. If you are cloning a {rhel} 8.10 server that will later be liberated to {sll}, you must perform extra steps to fix the kernel configuration files. - -+ ++ [IMPORTANT] ==== -{rhel} uses the machine ID to generate kernel entries in [path]``/boot/loader/entries``. + +* If you are cloning a {rhel} 8.10 server that will later be liberated to {sll}, you must perform extra steps to fix the kernel configuration files. + + +* {rhel} uses the machine ID to generate kernel entries in [path]``/boot/loader/entries``. Not performing these steps will result in a mix of old and new kernel entries after the liberation, as {sll} kernels will create new entries instead of replacing the old ones. -==== -+ -. After changing the machine ID and before liberating, run: + +* After changing the machine ID and before liberating, run: + + ---- sudo rm -rf /boot/loader/entries/ -sudo for ver in $(rpm -q kernel --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n'); do echo "Reinstalling kernel $ver..."; sudo kernel-install add $ver /lib/modules/$ver; done +sudo for ver in $(rpm -q kernel --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n'); do echo "Reinstalling kernel $ver..."; sudo kernel-install add $ver /lib/modules/$ver; done sudo grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg ---- -+ +* For more information and example on liberating {rhel} 8.10 server, see xref:common-workflows:workflow-liberate-rhel-with-secureboot.adoc[]. -For more information and example on liberating {rhel} 8.10 server, see xref:common-workflows:workflow-liberate-rhel-with-secureboot.adoc[]. +==== . *Reconfiguring {salt} Clients* -. If your clients still have the same Salt client ID, delete the [path]``minion_id`` file on each client (FQDN is used when it is regenerated on client restart). - For Salt Minion clients: +.. If your clients still have the same Salt client ID, delete the [path]``minion_id`` file on each client (FQDN is used when it is regenerated on client restart). + +... For Salt Minion clients: + + ---- @@ -125,7 +133,7 @@ rm -rf /etc/salt/pki + -For Salt Bundle clients: +... For Salt Bundle clients: + @@ -134,8 +142,11 @@ rm /etc/venv-salt-minion/minion_id rm -rf /etc/venv-salt-minion/pki ---- -. Delete accepted keys from the onboarding page and the system profile from {productname}, and restart the client with. - For Salt Minion clients: ++ + +.. Delete accepted keys from the onboarding page and the system profile from {productname}, and restart the client with. + +... For Salt Minion clients: + @@ -145,14 +156,18 @@ service salt-minion restart + -For Salt Bundle clients: +... For Salt Bundle clients: + + ---- service venv-salt-minion restart ---- -. Re-register the clients. - Each client now has a different [path]``/etc/machine-id`` and should be correctly displayed on the [guimenu]``System Overview`` page. -_____ ++ + +.. Re-register the clients. + Each client now has a different [path]``/etc/machine-id`` and should be correctly displayed on the [guimenu]``System Overview`` page. + +____