OSDOCS#8718: vSphere TOC refactor

Author: mjpytlak

Diff for: _topic_maps/_topic_map.yml

@@ -469,29 +469,37 @@ Topics:
   Topics:
   - Name: Preparing to install on vSphere
     File: preparing-to-install-on-vsphere
-  - Name: Installing a cluster on vSphere
-    File: installing-vsphere-installer-provisioned
-  - Name: Installing a cluster on vSphere with customizations
-    File: installing-vsphere-installer-provisioned-customizations
-  - Name: Installing a cluster on vSphere with network customizations
-    File: installing-vsphere-installer-provisioned-network-customizations
-  - Name: Installing a cluster on vSphere with user-provisioned infrastructure
-    File: installing-vsphere
-  - Name: Installing a cluster on vSphere with user-provisioned infrastructure and network customizations
-    File: installing-vsphere-network-customizations
-  - Name: Installing a cluster on vSphere in a restricted network
-    File: installing-restricted-networks-installer-provisioned-vsphere
-  - Name: Installing a cluster on vSphere in a restricted network with user-provisioned infrastructure
-    File: installing-restricted-networks-vsphere
-  - Name: Installing a three-node cluster on vSphere
+  - Name: Installer-provisioned infrastructure
+    Dir: ipi
+    Distros: openshift-origin,openshift-enterprise
+    Topics:
+    - Name: Installing a cluster
+      File: installing-vsphere-installer-provisioned
+    - Name: Installing a cluster with customizations
+      File: installing-vsphere-installer-provisioned-customizations
+    - Name: Installing a cluster with network customizations
+      File: installing-vsphere-installer-provisioned-network-customizations
+    - Name: Installing a cluster in a restricted network
+      File: installing-restricted-networks-installer-provisioned-vsphere
+  - Name: User-provisioned infrastructure
+    Dir: upi
+    Distros: openshift-origin,openshift-enterprise
+    Topics:
+    - Name: Installing a cluster
+      File: installing-vsphere
+    - Name: Installing a cluster with network customizations
+      File: installing-vsphere-network-customizations
+    - Name: Installing a cluster in a restricted network
+      File: installing-restricted-networks-vsphere
+  - Name: Installing a three-node cluster
     File: installing-vsphere-three-node
   - Name: Configuring the vSphere connection settings after an installation
     File: installing-vsphere-post-installation-configuration
-  - Name: Uninstalling a cluster on vSphere that uses installer-provisioned infrastructure
+  - Name: Uninstalling a cluster
     File: uninstalling-cluster-vsphere-installer-provisioned
   - Name: Using the vSphere Problem Detector Operator
     File: using-vsphere-problem-detector-operator
-  - Name: Installation configuration parameters for vSphere
+  - Name: Installation configuration parameters
     File: installation-config-parameters-vsphere
 - Name: Installing on any platform
   Dir: installing_platform_agnostic

Diff for: distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc

@@ -30,7 +30,7 @@ Before you can install {DTProductName}, review the installation activities, and
 ** xref:../../installing/installing_aws/installing-aws-account.adoc#installing-aws-account[Install {product-title} {product-version} on AWS]
 ** xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[Install {product-title} {product-version} on user-provisioned AWS]
 ** xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Install {product-title} {product-version} on bare metal]
-** xref:../../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[Install {product-title} {product-version} on vSphere]
+** xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[Install {product-title} {product-version} on vSphere]
 * Install the version of the `oc` CLI tool that matches your {product-title} version and add it to your path.
 
 * An account with the `cluster-admin` role.

Diff for: installing/disconnected_install/installing-mirroring-installation-images.adoc

@@ -144,7 +144,7 @@ include::modules/olm-mirroring-catalog-post.adoc[leveloffset=+2]
 //* TODO need to add the registry secret to the machines, which is different
 
 * Install a cluster on infrastructure that you provision in your restricted network, such as on
-xref:../../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[VMware vSphere],
+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/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services].
 
 [role="_additional-resources"]

Diff for: installing/installing-fips.adoc

@@ -94,7 +94,7 @@ To enable FIPS mode for your cluster, you must run the installation program from
 * xref:../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[{ibm-z-name} and {ibm-linuxone-name}]
 * xref:../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibm-z-name} and {ibm-linuxone-name} with {op-system-base} KVM]
 * xref:../installing/installing_openstack/installing-openstack-installer-custom.adoc#installing-openstack-installer-custom[{rh-openstack-first}]
-* xref:../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[VMware vSphere]
+* xref:../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[VMware vSphere]
 
 [NOTE]
 ====