Merge pull request #85849 from SNiemann15/ibmz_install_simplify

[OSDOCS-11790] Simplify IBM Z installation docs

Author: michaelryanpeter

_topic_maps/_topic_map.yml

@@ -475,23 +475,31 @@ Topics:
   Dir: installing_ibm_z
   Distros: openshift-enterprise
   Topics:
-  - Name: Preparing to install on IBM Z and IBM LinuxONE
+  - Name: Installation methods
     File: preparing-to-install-on-ibm-z
-  - Name: Installing a cluster with z/VM on IBM Z and IBM LinuxONE
-    File: installing-ibm-z
-  - Name: Restricted network IBM Z installation with z/VM
-    File: installing-restricted-networks-ibm-z
-  - Name: Installing a cluster with RHEL KVM on IBM Z and IBM LinuxONE
-    File: installing-ibm-z-kvm
-  - Name: Restricted network IBM Z installation with RHEL KVM
-    File: installing-restricted-networks-ibm-z-kvm
-  - Name: Installing a cluster in an LPAR on IBM Z and IBM LinuxONE
-    File: installing-ibm-z-lpar
-  - Name: Restricted network IBM Z installation in an LPAR
-    File: installing-restricted-networks-ibm-z-lpar
-  - Name: Installation configuration parameters for IBM Z and IBM LinuxONE
+  - Name: User-provisioned infrastructure
+    Dir: upi
+    Distros: openshift-enterprise
+    Topics:
+    - Name: Installation requirements
+      File: installing-ibm-z-reqs
+    - Name: Preparing to install a cluster
+      File: upi-ibm-z-preparing-to-install
+    - Name: Installing a cluster with z/VM
+      File: installing-ibm-z
+    - Name: Installing a cluster with z/VM in a disconnected environment
+      File: installing-restricted-networks-ibm-z
+    - Name: Installing a cluster with RHEL KVM
+      File: installing-ibm-z-kvm
+    - Name: Installing a cluster with RHEL KVM in a disconnected environment
+      File: installing-restricted-networks-ibm-z-kvm
+    - Name: Installing a cluster in an LPAR
+      File: installing-ibm-z-lpar
+    - Name: Installing a cluster in an LPAR in a disconnected environment
+      File: installing-restricted-networks-ibm-z-lpar
+  - Name: Installation configuration parameters
     File: installation-config-parameters-ibm-z
-  - Name: Configuring additional devices in an IBM Z or IBM LinuxONE environment
+  - Name: Configuring additional devices
     File: ibmz-post-install
 - Name: Installing on IBM Power
   Dir: installing_ibm_power

disconnected/installing.adoc

@@ -86,11 +86,11 @@ ifndef::openshift-origin[]
 
 To learn more about installing a cluster on {ibm-z-name} or {ibm-linuxone-name} in a disconnected environment, see the following procedures:
 
-* xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibm-z-title} and {ibm-linuxone-title} in a restricted network]
+* xref:../installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibm-z-title} and {ibm-linuxone-title} in a restricted network]
 
-* xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibm-z-title} and {ibm-linuxone-title} in a restricted network]
+* xref:../installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibm-z-title} and {ibm-linuxone-title} in a restricted network]
 
-* xref:../installing/installing_ibm_z/installing-restricted-networks-ibm-z-lpar.adoc#installing-restricted-networks-ibm-z-lpar[Installing a cluster in an LPAR on {ibm-z-title} and {ibm-linuxone-title} in a restricted network]
+* xref:../installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc#installing-restricted-networks-ibm-z-lpar[Installing a cluster in an LPAR on {ibm-z-title} and {ibm-linuxone-title} in a restricted network]
 
 [id="installing-ibm-power_{context}"]
 == Installing a cluster on {ibm-power-title}

hosted_control_planes/hcp-deploy/hcp-deploy-ibmz.adoc

@@ -66,4 +66,4 @@ include::modules/hcp-ibm-z-scale-np.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installation-operators-config[Initial Operator configuration]
+* xref:../../installing/installing_ibm_z/upi/installing-ibm-z.adoc#installation-operators-config[Initial Operator configuration]

hosted_control_planes/hcp-manage/hcp-manage-ibm-power.adoc

@@ -17,5 +17,5 @@ include::modules/hcp-ibm-power-scale-np.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installation-operators-config[Initial Operator configuration]
+* xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installation-operators-config[Initial Operator configuration]
 * xref:../../hosted_control_planes/hcp-troubleshooting.adoc#scale-down-data-plane_hcp-troubleshooting[Scaling down the data plane to zero]