HCIDOCS-590: 4.16 cherry pick for PR 83982

_topic_maps/_topic_map.yml

@@ -368,34 +368,38 @@ Topics:
   Topics:
   - Name: Preparing to install on bare metal
     File: preparing-to-install-on-bare-metal
-  - Name: Installing a user-provisioned cluster on bare metal
-    File: installing-bare-metal
-  - Name: Installing a user-provisioned bare metal cluster with network customizations
-    File: installing-bare-metal-network-customizations
-  - Name: Installing a user-provisioned bare metal cluster on a restricted network
-    File: installing-restricted-networks-bare-metal
-  - Name: Scaling a user-provisioned installation with the bare metal operator
-    File: scaling-a-user-provisioned-cluster-with-the-bare-metal-operator
-  - Name: Installation configuration parameters for bare metal
-    File: installation-config-parameters-bare-metal
-- Name: Deploying installer-provisioned clusters on bare metal
-  Dir: installing_bare_metal_ipi
-  Distros: openshift-origin,openshift-enterprise
-  Topics:
-  - Name: Overview
-    File: ipi-install-overview
-  - Name: Prerequisites
-    File: ipi-install-prerequisites
-  - Name: Setting up the environment for an OpenShift installation
-    File: ipi-install-installation-workflow
-  - Name: Installing a cluster
-    File: ipi-install-installing-a-cluster
-  - Name: Troubleshooting the installation
-    File: ipi-install-troubleshooting
-  - Name: Postinstallation configuration
-    File: ipi-install-post-installation-configuration
-  - Name: Expanding the cluster
-    File: ipi-install-expanding-the-cluster
+  - Name: User-provisioned infrastructure
+    Dir: upi
+    Distros: openshift-origin,openshift-enterprise
+    Topics:
+    - Name: Installing a user-provisioned cluster on bare metal
+      File: installing-bare-metal
+    - Name: Installing a user-provisioned bare metal cluster with network customizations
+      File: installing-bare-metal-network-customizations
+    - Name: Installing a user-provisioned bare metal cluster on a restricted network
+      File: installing-restricted-networks-bare-metal
+    - Name: Scaling a user-provisioned installation with the bare metal operator
+      File: scaling-a-user-provisioned-cluster-with-the-bare-metal-operator
+    - Name: Installation configuration parameters for bare metal
+      File: installation-config-parameters-bare-metal
+  - Name: Installer-provisioned infrastructure
+    Dir: ipi
+    Distros: openshift-origin,openshift-enterprise
+    Topics:
+    - Name: Overview
+      File: ipi-install-overview
+    - Name: Prerequisites
+      File: ipi-install-prerequisites
+    - Name: Setting up the environment for an OpenShift installation
+      File: ipi-install-installation-workflow
+    - Name: Installing a cluster
+      File: ipi-install-installing-a-cluster
+    - Name: Troubleshooting the installation
+      File: ipi-install-troubleshooting
+    - Name: Postinstallation configuration
+      File: ipi-install-post-installation-configuration
+    - Name: Expanding the cluster
+      File: ipi-install-expanding-the-cluster
 - Name: Installing IBM Cloud Bare Metal (Classic)
   Dir: installing_ibm_cloud
   Distros: openshift-origin,openshift-enterprise

backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.adoc

@@ -18,9 +18,9 @@ include::modules/dr-restoring-cluster-state.adoc[leveloffset=+1]
 [id="additional-resources_dr-restoring-cluster-state"]
 == Additional resources
 
-* xref:../../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]
+* xref:../../../installing/installing_bare_metal/upi/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_ipi/ipi-install-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_ipi-install-expanding[Replacing a bare-metal control plane node]
+* xref:../../../installing/installing_bare_metal/upi/ipi/ipi-install-expanding-the-cluster.adoc#replacing-a-bare-metal-control-plane-node_ipi-install-expanding[Replacing a bare-metal control plane node]
 
 include::modules/dr-scenario-cluster-state-issues.adoc[leveloffset=+1]
 

edge_computing/ztp-deploying-far-edge-sites.adoc

@@ -65,7 +65,7 @@ include::modules/ztp-sno-siteconfig-config-reference.adoc[leveloffset=+2]
 
 * xref:../edge_computing/ztp-manual-install.adoc#ztp-creating-the-site-secrets_ztp-manual-install[Creating the managed bare-metal host secrets]
 
-* xref:../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
+* xref:../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
 
 * xref:../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#root-device-hints_preparing-to-install-with-agent-based-installer[About root device hints]
 

edge_computing/ztp-manual-install.adoc

@@ -27,7 +27,7 @@ include::modules/ztp-generating-install-and-config-crs-manually.adoc[leveloffset
 
 * xref:../edge_computing/ztp-reference-cluster-configuration-for-vdu.adoc#ztp-sno-du-enabling-workload-partitioning_sno-configure-for-vdu[Workload partitioning]
 
-* xref:../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
+* xref:../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
 
 * xref:../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#root-device-hints_preparing-to-install-with-agent-based-installer[About root device hints]
 

installing/disconnected_install/installing-mirroring-installation-images.adoc

@@ -145,7 +145,7 @@ include::modules/olm-mirroring-catalog-post.adoc[leveloffset=+2]
 
 * Install a cluster on infrastructure that you provision in your restricted network, such as on
 xref:../../installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[VMware vSphere],
-xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal], or xref:../../installing/installing_aws/upi/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services].
+xref:../../installing/installing_bare_metal/upi/upi/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal], or xref:../../installing/installing_aws/upi/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services].
 
 [role="_additional-resources"]
 [id="restricted-networks-additional-resources"]

installing/installing_bare_metal/ipi/images

@@ -0,0 +1 @@
+../../images/

installing/installing_bare_metal_ipi/ipi-install-expanding-the-cluster.adoc → installing/installing_bare_metal/ipi/ipi-install-expanding-the-cluster.adoc

@@ -18,7 +18,7 @@ include::modules/ipi-install-preparing-the-bare-metal-node.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#configuring-host-network-interfaces-in-the-install-config-yaml-file_ipi-install-installation-workflow[Optional: Configuring host network interfaces in the install-config.yaml file] for details on configuring the NMState syntax.
+* See xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#configuring-host-network-interfaces-in-the-install-config-yaml-file_ipi-install-installation-workflow[Optional: Configuring host network interfaces in the install-config.yaml file] for details on configuring the NMState syntax.
 * See xref:../../scalability_and_performance/managing-bare-metal-hosts.adoc#automatically-scaling-machines-to-available-bare-metal-hosts_managing-bare-metal-hosts[Automatically scaling machines to the number of available bare metal hosts] for details on automatically scaling machines.
 
 include::modules/ipi-install-replacing-a-bare-metal-control-plane-node.adoc[leveloffset=+1]
@@ -32,7 +32,7 @@ include::modules/ipi-install-replacing-a-bare-metal-control-plane-node.adoc[leve
 
 * xref:../../post_installation_configuration/post-install-bare-metal-configuration.adoc#post-install-bare-metal-configuration[Bare metal configuration]
 
-* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
+* xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
 
 include::modules/ipi-install-preparing-to-deploy-with-virtual-media-on-the-baremetal-network.adoc[leveloffset=+1]
 

installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc → installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc

@@ -18,9 +18,9 @@ include::modules/ipi-install-checking-ntp-sync.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#configuring-ntp-for-disconnected-clusters_ipi-install-installation-workflow[Optional: Configuring NTP for disconnected clusters]
+* xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#configuring-ntp-for-disconnected-clusters_ipi-install-installation-workflow[Optional: Configuring NTP for disconnected clusters]
 
-* xref:../../installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc#network-requirements-ntp_ipi-install-prerequisites[Network Time Protocol (NTP)]
+* xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-prerequisites.adoc#network-requirements-ntp_ipi-install-prerequisites[Network Time Protocol (NTP)]
 
 // Configuring networking
 include::modules/ipi-install-configuring-networking.adoc[leveloffset=+1]
@@ -165,7 +165,7 @@ include::modules/ipi-install-creating-a-disconnected-registry.adoc[leveloffset=+
 [id="prerequisites_ipi-disconnected-registry"]
 === Prerequisites
 
-* If you have already prepared a mirror registry for xref:../../installing/disconnected_install/installing-mirroring-installation-images.adoc#prerequisites_installing-mirroring-installation-images[Mirroring images for a disconnected installation], you can skip directly to xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#ipi-modify-install-config-for-a-disconnected-registry_ipi-install-installation-workflow[Modify the install-config.yaml file to use the disconnected registry].
+* If you have already prepared a mirror registry for xref:../../installing/disconnected_install/installing-mirroring-installation-images.adoc#prerequisites_installing-mirroring-installation-images[Mirroring images for a disconnected installation], you can skip directly to xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#ipi-modify-install-config-for-a-disconnected-registry_ipi-install-installation-workflow[Modify the install-config.yaml file to use the disconnected registry].
 
 // Preparing the registry node to host the mirrored registry
 include::modules/ipi-install-preparing-a-disconnected-registry.adoc[leveloffset=+2]

installing/installing_bare_metal_ipi/ipi-install-prerequisites.adoc → installing/installing_bare_metal/ipi/ipi-install-prerequisites.adoc

@@ -37,7 +37,7 @@ include::modules/ipi-install-firmware-requirements-for-installing-with-virtual-m
 [role="_additional-resources"]
 .Additional resources
 
-xref:../../installing/installing_bare_metal_ipi/ipi-install-troubleshooting.adoc#unable-to-discover-new-bare-metal-hosts-using-the-bmc_ipi-install-troubleshooting[Unable to discover new bare metal hosts using the BMC]
+xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-troubleshooting.adoc#unable-to-discover-new-bare-metal-hosts-using-the-bmc_ipi-install-troubleshooting[Unable to discover new bare metal hosts using the BMC]
 
 include::modules/ipi-install-network-requirements.adoc[leveloffset=+1]
 

installing/installing_bare_metal/preparing-to-install-on-bare-metal.adoc

@@ -29,9 +29,9 @@ include::modules/nw-sriov-dual-nic-con.adoc[leveloffset=+1]
 
 * xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#agent-install-sample-config-bond-sriov_preparing-to-install-with-agent-based-installer[Example: Bonds and SR-IOV dual-nic node network configuration]
 
-* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#configuring-host-dual-network-interfaces-in-the-install-config-yaml-file_ipi-install-installation-workflow[Optional: Configuring host network interfaces for dual port NIC]
+* xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-installation-workflow.adoc#configuring-host-dual-network-interfaces-in-the-install-config-yaml-file_ipi-install-installation-workflow[Optional: Configuring host network interfaces for dual port NIC]
 
-* xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#bonding-multiple-sriov-network-interfaces-to-dual-port_installing-bare-metal[Bonding multiple SR-IOV network interfaces to a dual port NIC interface]
+* xref:../../installing/installing_bare_metal/upi/upi/installing-bare-metal.adoc#bonding-multiple-sriov-network-interfaces-to-dual-port_installing-bare-metal[Bonding multiple SR-IOV network interfaces to a dual port NIC interface]
 
 [id="choosing-a-method-to-install-ocp-on-bare-metal"]
 == Choosing a method to install {product-title} on bare metal
@@ -42,9 +42,9 @@ The {product-title} installation program offers four methods for deploying a clu
 
 * *Local Agent-based*: You can deploy a cluster locally with the xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#preparing-to-install-with-agent-based-installer[agent-based installer] for air-gapped or restricted networks. It provides many of the benefits of the {ai-full}, but you must download and configure the link:https://console.redhat.com/openshift/install/metal/agent-based[agent-based installer] first. Configuration is done with a commandline interface. This approach is ideal for air-gapped or restricted networks.
 
-* *Automated*: You can xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[deploy a cluster on installer-provisioned infrastructure] and the cluster it maintains. The installer uses each cluster host's baseboard management controller (BMC) for provisioning. You can deploy clusters with both connected or air-gapped or restricted networks.
+* *Automated*: You can xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-overview.adoc#ipi-install-overview[deploy a cluster on installer-provisioned infrastructure] and the cluster it maintains. The installer uses each cluster host's baseboard management controller (BMC) for provisioning. You can deploy clusters with both connected or air-gapped or restricted networks.
 
-* *Full control*: You can deploy a cluster on xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[infrastructure that you prepare and maintain], which provides maximum customizability. You can deploy clusters with both connected or air-gapped or restricted networks.
+* *Full control*: You can deploy a cluster on xref:../../installing/installing_bare_metal/upi/upi/installing-bare-metal.adoc#installing-bare-metal[infrastructure that you prepare and maintain], which provides maximum customizability. You can deploy clusters with both connected or air-gapped or restricted networks.
 
 The clusters have the following characteristics:
 
@@ -58,15 +58,15 @@ See xref:../../architecture/architecture-installation.adoc#installation-process_
 
 You can install a cluster on bare metal infrastructure that is provisioned by the {product-title} installation program, by using the following method:
 
-* **xref:../../installing/installing_bare_metal_ipi/ipi-install-overview.adoc#ipi-install-overview[Installing an installer-provisioned cluster on bare metal]**: You can install {product-title} on bare metal by using installer provisioning.
+* **xref:../../installing/installing_bare_metal/upi/ipi/ipi-install-overview.adoc#ipi-install-overview[Installing an installer-provisioned cluster on bare metal]**: You can install {product-title} on bare metal by using installer provisioning.
 
 [id="choosing-a-method-to-install-ocp-on-bare-metal-user-provisioned"]
 === Installing a cluster on user-provisioned infrastructure
 
 You can install a cluster on bare metal infrastructure that you provision, by using one of the following methods:
 
-* **xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]**: You can install {product-title} on bare metal infrastructure that you provision. For a cluster that contains user-provisioned infrastructure, you must deploy all of the required machines.
+* **xref:../../installing/installing_bare_metal/upi/upi/installing-bare-metal.adoc#installing-bare-metal[Installing a user-provisioned cluster on bare metal]**: You can install {product-title} on bare metal infrastructure that you provision. For a cluster that contains user-provisioned infrastructure, you must deploy all of the required machines.
 
-* **xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[Installing a user-provisioned bare metal cluster with network customizations]**: You can install a bare metal cluster on user-provisioned infrastructure with network-customizations. By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. Most of the network customizations must be applied at the installation stage.
+* **xref:../../installing/installing_bare_metal/upi/upi/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[Installing a user-provisioned bare metal cluster with network customizations]**: You can install a bare metal cluster on user-provisioned infrastructure with network-customizations. By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. Most of the network customizations must be applied at the installation stage.
 
-* **xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[Installing a user-provisioned bare metal cluster on a restricted network]**: You can install a user-provisioned bare metal cluster on a restricted or disconnected network by using a mirror registry. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content.
+* **xref:../../installing/installing_bare_metal/upi/upi/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[Installing a user-provisioned bare metal cluster on a restricted network]**: You can install a user-provisioned bare metal cluster on a restricted or disconnected network by using a mirror registry. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content.

installing/installing_bare_metal/upi/_attributes

@@ -0,0 +1 @@
+../../_attributes/

installing/installing_bare_metal/upi/images

@@ -0,0 +1 @@
+../../images/