using modules instead of xrefs

Author: lahinson

etcd/etcd-backup-restore/etcd-backup.adoc

@@ -19,6 +19,14 @@ Back up your cluster's etcd data by performing a single invocation of the backup
 
 After you have an etcd backup, you can xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[restore to a previous cluster state].
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[Backing up etcd data]:: To back up etcd, you create an etcd snapshot and back up the resources for the static pods. You can save the backup and used it later if you need to restore etcd.
+// Backing up etcd data
+include::modules/backup-etcd.adoc[leveloffset=+1]
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#creating-automated-etcd-backups_backup-etcd[Creating automated etcd backups]:: You can automate recurring and single backups. Automated backups is a Technology Preview feature.
+[role="_additional-resources"]
+.Additional resources
+* xref:../../hosted_control_planes/hcp_high_availability/hcp-recovering-etcd-cluster.adoc#hcp-recovering-etcd-cluster[Recovering an unhealthy etcd cluster]
+
+// Creating automated etcd backups
+include::modules/etcd-creating-automated-backups.adoc[leveloffset=+1]
+include::modules/creating-single-etcd-backup.adoc[leveloffset=+2]
+include::modules/creating-recurring-etcd-backups.adoc[leveloffset=+2]

etcd/etcd-backup-restore/etcd-disaster-recovery.adoc

@@ -13,24 +13,62 @@ The disaster recovery documentation provides information for administrators on h
 Disaster recovery requires you to have at least one healthy control plane host.
 ====
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/quorum-restoration.adoc#dr-quorum-restoration[Quorum restoration]:: This solution handles situations where you have lost the majority of your control plane hosts, leading to etcd quorum loss and the cluster going offline. This solution does not require an etcd backup.
-+
+== Quorum restoration
+
+You can use the `quorum-restore.sh` script to restore etcd quorum on clusters that are offline due to quorum loss. When quorum is lost, the {product-title} API becomes read-only. After quorum is restored, the {product-title} API returns to read/write mode.
+
+// Restoring etcd quorum for high availability clusters
+include::modules/dr-restoring-etcd-quorum-ha.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_bare_metal/upi/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]
+* xref:../../installing/installing_bare_metal/bare-metal-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_bare-metal-expanding[Replacing a bare-metal control plane node]
+
 [NOTE]
 ====
 If you have a majority of your control plane nodes still available and have an etcd quorum, xref:../../etcd/etcd-backup-restore/replace-unhealthy-etcd-member.adoc#replace-unhealthy-etcd-member[replace a single unhealthy etcd member].
 ====
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[Restoring to a previous cluster state]:: This solution handles situations where you want to restore your cluster to a previous state, for example, if an administrator deletes something critical. If you have taken an etcd backup, you can restore your cluster to a previous state.
-+
+== Restoring to a previous cluster state
+
+To restore the cluster to a previous state, you must have previously backed up the `etcd` data by creating a snapshot. You will use this snapshot to restore the cluster state. For more information, see "Backing up etcd data".
+
 If applicable, you might also need to xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[recover from expired control plane certificates].
 +
 [WARNING]
 ====
 Restoring to a previous cluster state is a destructive and destablizing action to take on a running cluster. This procedure should only be used as a last resort.
 
-Before performing a restore, see xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-scenario-2-restoring-cluster-state-about_dr-restoring-cluster-state[About restoring to a previous cluster state] for more information on the impact to the cluster.
+Before performing a restore, see "About restoring to a previous cluster state" for more information on the impact to the cluster.
 ====
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-recovering-expired-certs[Recovering from expired control plane certificates]:: This solution handles situations where your control plane certificates have expired. For example, if you shut down your cluster before the first certificate rotation, which occurs 24 hours after installation, your certificates will not be rotated and will expire. You can follow this procedure to recover from expired control plane certificates.
+// About restoring to a previous cluster state
+include::modules/dr-restoring-cluster-state-about.adoc[leveloffset=+2]
+
+// Restoring to a previous cluster state for a single node
+include::modules/dr-restoring-cluster-state-sno.adoc[leveloffset=+2]
+
+// Restoring to a previous cluster state
+include::modules/dr-restoring-cluster-state.adoc[leveloffset=+2]
+
+// Restoring a cluster from etcd backup manually
+include::modules/manually-restoring-cluster-etcd-backup.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backing-up-etcd-data_backup-etcd[Backing up etcd data]
+* xref:../../installing/installing_bare_metal/upi/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]
+* xref:../../networking/accessing-hosts.adoc#accessing-hosts[Creating a bastion host to access {product-title} instances and the control plane nodes with SSH]
+* xref:../../installing/installing_bare_metal/bare-metal-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_bare-metal-expanding[Replacing a bare-metal control plane node]
+
+include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+2]
+
+// Recovering from expired control plane certificates
+include::modules/dr-recover-expired-control-plane-certs.adoc[leveloffset=+1]
+
+include::modules/dr-testing-restore-procedures.adoc[leveloffset=+1]
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/about-disaster-recovery.adoc#dr-testing-restore-procedures_about-dr[Testing restore procedures]:: Test the restore procedure to ensure that your automation and workload handle the new cluster state gracefully.
+[role="_additional-resources"]
+.Additional resources
+* xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc#dr-restoring-cluster-state[Restoring to a previous cluster state]

etcd/etcd-backup-restore/replace-unhealthy-etcd-member.adoc

@@ -17,12 +17,35 @@ If the control plane certificates are not valid on the member being replaced, th
 If a control plane node is lost and a new one is created, the etcd cluster Operator handles generating the new TLS certificates and adding the node as an etcd member.
 ====
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#restore-identify-unhealthy-etcd-member_replacing-unhealthy-etcd-member[Identifying an unhealthy etcd member]:: Identify an unhealthy etcd member in your cluster.
+// Identifying an unhealthy etcd member
+include::modules/restore-identify-unhealthy-etcd-member.adoc[leveloffset=+1]
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#restore-determine-state-etcd-member_replacing-unhealthy-etcd-member[Determining the state of the unhealthy etcd member]:: Confirm why your etcd member is unhealthy by determining its state:
+// Determining the state of the unhealthy etcd member
+include::modules/restore-determine-state-etcd-member.adoc[leveloffset=+1]
 
-* The machine for the etcd member is not running or its node is not ready
-* The etcd pod for the etcd member is crashlooping
-* The machine for a bare metal etcd member is not running or its node is not ready
+== Replacing the unhealthy etcd member
 
-xref:../../backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.adoc#replacing-the-unhealthy-etcd-member[Replacing the unhealthy etcd member]:: Replace your etcd member by completing steps that are specific to the state of the etcd member.
+Depending on the state of your unhealthy etcd member, use one of the following procedures:
+
+* Replacing an unhealthy etcd member whose machine is not running or whose node is not ready
+* Installing a primary control plane node on an unhealthy cluster
+* Replacing an unhealthy etcd member whose etcd pod is crashlooping
+* Replacing an unhealthy stopped baremetal etcd member
+
+// Replacing an unhealthy etcd member whose machine is not running or whose node is not ready
+include::modules/restore-replace-stopped-etcd-member.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../machine_management/control_plane_machine_management/cpmso-troubleshooting.adoc#cpmso-ts-etcd-degraded_cpmso-troubleshooting[Recovering a degraded etcd Operator]
+* link:https://docs.redhat.com/en/documentation/assisted_installer_for_openshift_container_platform/2024/html/installing_openshift_container_platform_with_the_assisted_installer/expanding-the-cluster#installing-primary-control-plane-node-unhealthy-cluster_expanding-the-cluster[Installing a primary control plane node on an unhealthy cluster]
+
+// Replacing an unhealthy etcd member whose etcd pod is crashlooping
+include::modules/restore-replace-crashlooping-etcd-member.adoc[leveloffset=+2]
+
+// Replacing an unhealthy baremetal stopped etcd member
+include::modules/restore-replace-stopped-baremetal-etcd-member.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../machine_management/deleting-machine.adoc#machine-lifecycle-hook-deletion-etcd_deleting-machine[Quorum protection with machine lifecycle hooks]