Merge pull request #69675 from mjpytlak/osdocs-8721

OSDOCS#8721: Refactor of vSphere install reqs for IPI

Author: mjpytlak

_topic_maps/_topic_map.yml

@@ -469,6 +469,8 @@ Topics:
     Dir: ipi
     Distros: openshift-origin,openshift-enterprise
     Topics:
+    - Name: vSphere installation requirements
+      File: ipi-vsphere-installation-reqs
     - Name: Installing a cluster
       File: installing-vsphere-installer-provisioned
     - Name: Installing a cluster with customizations

installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc

@@ -35,29 +35,6 @@ include::modules/installation-about-restricted-network.adoc[leveloffset=+1]
 
 include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
-include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-network-requirements.adoc[leveloffset=+1]
-
-include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* To remove a third-party vSphere CSI driver, see xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver].
-* To update the hardware version for your vSphere nodes, see xref:../../../updating/updating_a_cluster/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere].
-
-include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-infra-static-ip-nodes.adoc[leveloffset=+2]
-
-[role="_additional-resources"]
-.Additional resources
-
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-scaling-machines-static-ip_post-install-node-tasks[Scaling machines to use static IP addresses]
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-machine-set-scaling-static-ip_post-install-node-tasks[Using a machine set to scale machines with configured static IP addresses]
-
-
 include::modules/ssh-agent-using.adoc[leveloffset=+1]
 
 include::modules/installation-adding-vcenter-root-certificates.adoc[leveloffset=+1]

installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc

@@ -28,25 +28,6 @@ Be sure to also review this site list if you are configuring a proxy.
 
 include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
-include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-network-requirements.adoc[leveloffset=+1]
-
-include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* To remove a third-party vSphere CSI driver, see xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver].
-* To update the hardware version for your vSphere nodes, see xref:../../../updating/updating_a_cluster/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere].
-
-include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-infra-static-ip-nodes.adoc[leveloffset=+2]
-
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-scaling-machines-static-ip_post-install-node-tasks[Scaling machines to use static IP addresses]
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-machine-set-scaling-static-ip_post-install-node-tasks[Using a machine set to scale machines with configured static IP addresses]
-
 include::modules/ssh-agent-using.adoc[leveloffset=+1]
 
 include::modules/installation-obtaining-installer.adoc[leveloffset=+1]

installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc

@@ -30,25 +30,6 @@ Be sure to also review this site list if you are configuring a proxy.
 
 include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
-include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-network-requirements.adoc[leveloffset=+1]
-
-include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* To remove a third-party vSphere CSI driver, see xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver].
-* To update the hardware version for your vSphere nodes, see xref:../../../updating/updating_a_cluster/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere].
-
-include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-infra-static-ip-nodes.adoc[leveloffset=+2]
-
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-scaling-machines-static-ip_post-install-node-tasks[Scaling machines to use static IP addresses]
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-machine-set-scaling-static-ip_post-install-node-tasks[Using a machine set to scale machines with configured static IP addresses]
-
 include::modules/ssh-agent-using.adoc[leveloffset=+1]
 
 include::modules/installation-obtaining-installer.adoc[leveloffset=+1]

installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc

@@ -28,25 +28,6 @@ Be sure to also review this site list if you are configuring a proxy.
 
 include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
-include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-network-requirements.adoc[leveloffset=+1]
-
-include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* To remove a third-party vSphere CSI driver, see xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver].
-* To update the hardware version for your vSphere nodes, see xref:../../../updating/updating_a_cluster/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere].
-
-include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1]
-
-include::modules/installation-vsphere-installer-infra-static-ip-nodes.adoc[leveloffset=+2]
-
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-scaling-machines-static-ip_post-install-node-tasks[Scaling machines to use static IP addresses]
-* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-machine-set-scaling-static-ip_post-install-node-tasks[Using a machine set to scale machines with configured static IP addresses]
-
 include::modules/ssh-agent-using.adoc[leveloffset=+1]
 
 include::modules/installation-obtaining-installer.adoc[leveloffset=+1]

installing/installing_vsphere/ipi/ipi-vsphere-installation-reqs.adoc

@@ -0,0 +1,28 @@
+:_mod-docs-content-type: ASSEMBLY
+[id="ipi-vsphere-installation-reqs"]
+= vSphere installation requirements
+include::_attributes/common-attributes.adoc[]
+:context: ipi-vsphere-installation-reqs
+
+toc::[]
+
+Before you begin an installation using installer-provisioned infrastructure, be sure that your vSphere environment meets the following installation requirements.
+
+include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
+include::modules/installation-vsphere-installer-network-requirements.adoc[leveloffset=+1]
+include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+
+* To remove a third-party vSphere CSI driver, see xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver].
+* To update the hardware version for your vSphere nodes, see xref:../../../updating/updating_a_cluster/updating-hardware-on-nodes-running-on-vsphere.adoc#updating-hardware-on-nodes-running-on-vsphere[Updating hardware on nodes running in vSphere].
+
+include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+1]
+include::modules/installation-vsphere-installer-infra-static-ip-nodes.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+
+* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-scaling-machines-static-ip_post-install-node-tasks[Scaling machines to use static IP addresses]
+* xref:../../../post_installation_configuration/node-tasks.html#nodes-vsphere-machine-set-scaling-static-ip_post-install-node-tasks[Using a machine set to scale machines with configured static IP addresses]

installing/installing_vsphere/preparing-to-install-on-vsphere.adoc

@@ -57,15 +57,6 @@ User-provisioned infrastructure requires the user to provision all resources req
 
 * **xref:../../installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[Installing a cluster on vSphere in a restricted network with user-provisioned infrastructure]**: {product-title} can be installed on VMware vSphere infrastructure that you provision in a restricted network.
 
-include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
-
-include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* To remove a third-party vSphere CSI driver, see xref:../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-install-issues_persistent-storage-csi-vsphere[Removing a third-party vSphere CSI Driver].
-
 == Configuring the vSphere connection settings
 
 * **xref:../../installing/installing_vsphere/installing-vsphere-post-installation-configuration.adoc#installing-vsphere-post-installation-configuration[Updating the vSphere connection settings following an installation]**: For installations on vSphere using the Assisted Installer, you must manually update the vSphere connection settings to complete the installation. For installer-provisioned or user-provisioned infrastructure installations on vSphere, you can optionally validate or modify the vSphere connection settings at any time.

modules/installation-vsphere-infrastructure.adoc

@@ -1,12 +1,9 @@
 // Module included in the following assemblies:
 //
+// * installing/installing_vsphere/ipi/ipi-vsphere-installation-reqs.adoc
 // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
-// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
-// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
-// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
-// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
 
 [id="installation-vsphere-infrastructure_{context}"]
 = VMware vSphere infrastructure requirements

modules/installation-vsphere-installer-infra-requirements.adoc

@@ -1,17 +1,10 @@
 // Module included in the following assemblies for vSphere:
 //
-// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
-// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
-// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
+// * installing/installing_vsphere/ipi/ipi-vsphere-installation-reqs.adoc
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
-// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
 // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
 
-ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
-:restricted:
-endif::[]
-
 ifeval::["{context}" == "installing-vsphere"]
 :vsphere:
 endif::[]
@@ -446,9 +439,9 @@ Configure the default gateway to use the DHCP server. All nodes must be in the s
 
 You must use the Dynamic Host Configuration Protocol (DHCP) for the network and ensure that the DHCP server is configured to provide persistent IP addresses to the cluster machines. In the DHCP lease, you must configure the DHCP to use the default gateway. All nodes must be in the same VLAN. You cannot scale the cluster using a second VLAN as a Day 2 operation.
 
-ifdef::restricted[]
-The VM in your restricted network must have access to vCenter so that it can provision and manage nodes, persistent volume claims (PVCs), and other resources.
-endif::restricted[]
+
+If you are installing to a restricted environment, the VM in your restricted network must have access to vCenter so that it can provision and manage nodes, persistent volume claims (PVCs), and other resources.
+
 Additionally, you must create the following networking resources before you install the {product-title} cluster:
 
 [NOTE]
@@ -495,10 +488,6 @@ default. This record must be resolvable by both clients external to the cluster
 and from all the nodes within the cluster.
 |===
 
-ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
-:!restricted:
-endif::[]
-
 ifeval::["{context}" == "installing-vsphere"]
 :!vsphere:
 endif::[]

modules/installation-vsphere-installer-infra-static-ip-nodes.adoc

@@ -1,3 +1,7 @@
+// Module included in the following assemblies:
+//
+// * installing/installing_vsphere/ipi/ipi-vsphere-installation-reqs.adoc
+
 :_mod-docs-content-type: CONCEPT
 [discrete]
 [id="installation-vsphere-installer-infra-static-ip-nodes_{context}"]