Skip to content

Commit dea1a7b

Browse files
mjpytlakmjpytlak
committed
OSDOCS#8722: Refactor of vSphere install reqs for UPI
1 parent b52e0b8 commit dea1a7b

17 files changed

+95
-259
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,8 @@ Topics:
483483
Dir: upi
484484
Distros: openshift-origin,openshift-enterprise
485485
Topics:
486+
- Name: vSphere installation requirements
487+
File: upi-vsphere-installation-reqs
486488
- Name: Installing a cluster
487489
File: installing-vsphere
488490
- Name: Installing a cluster with network customizations

‎installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -41,56 +41,6 @@ include::modules/installation-about-restricted-network.adoc[leveloffset=+1]
4141

4242
include::modules/cluster-entitlements.adoc[leveloffset=+1]
4343

44-
include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
45-
46-
include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
47-
48-
[role="_additional-resources"]
49-
.Additional resources
50-
51-
* 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].
52-
* 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].
53-
54-
[id="installation-requirements-user-infra_{context}"]
55-
== Requirements for a cluster with user-provisioned infrastructure
56-
57-
For a cluster that contains user-provisioned infrastructure, you must deploy all
58-
of the required machines.
59-
60-
This section describes the requirements for deploying {product-title} on user-provisioned infrastructure.
61-
62-
include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+2]
63-
64-
[role="_additional-resources"]
65-
.Additional resources
66-
* xref:../../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere_creating-machineset-vsphere[Creating a compute machine set on vSphere]
67-
68-
include::modules/installation-machine-requirements.adoc[leveloffset=+2]
69-
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
70-
71-
[role="_additional-resources"]
72-
.Additional resources
73-
74-
* xref:../../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage]
75-
76-
include::modules/installation-vsphere-encrypted-vms.adoc[leveloffset=+2]
77-
[role="_additional-resources"]
78-
.Additional resources
79-
* xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#vsphere-encryption[Creating an encrypted storage class]
80-
81-
include::modules/csr-management.adoc[leveloffset=+2]
82-
83-
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
84-
85-
[role="_additional-resources"]
86-
.Additional resources
87-
88-
* xref:../../../installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Configuring chrony time service]
89-
90-
include::modules/installation-dns-user-infra.adoc[leveloffset=+2]
91-
92-
include::modules/installation-load-balancing-user-infra.adoc[leveloffset=+2]
93-
9444
include::modules/installation-infrastructure-user-infra.adoc[leveloffset=+1]
9545

9646
include::modules/installation-user-provisioned-validating-dns.adoc[leveloffset=+1]

‎installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -33,56 +33,6 @@ The steps for performing a user-provisioned infrastructure installation are prov
3333

3434
include::modules/cluster-entitlements.adoc[leveloffset=+1]
3535

36-
include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
37-
38-
include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
39-
40-
[role="_additional-resources"]
41-
.Additional resources
42-
43-
* 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].
44-
* 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].
45-
46-
[id="installation-requirements-user-infra_{context}"]
47-
== Requirements for a cluster with user-provisioned infrastructure
48-
49-
For a cluster that contains user-provisioned infrastructure, you must deploy all
50-
of the required machines.
51-
52-
This section describes the requirements for deploying {product-title} on user-provisioned infrastructure.
53-
54-
include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+2]
55-
56-
[role="_additional-resources"]
57-
.Additional resources
58-
* xref:../../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere_creating-machineset-vsphere[Creating a compute machine set on vSphere]
59-
60-
include::modules/installation-machine-requirements.adoc[leveloffset=+2]
61-
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
62-
63-
[role="_additional-resources"]
64-
.Additional resources
65-
66-
* xref:../../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage]
67-
68-
include::modules/installation-vsphere-encrypted-vms.adoc[leveloffset=+2]
69-
[role="_additional-resources"]
70-
.Additional resources
71-
* xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#vsphere-pv-encryption[Creating an encrypted storage class]
72-
73-
include::modules/csr-management.adoc[leveloffset=+2]
74-
75-
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
76-
77-
[role="_additional-resources"]
78-
.Additional resources
79-
80-
* xref:../../../<installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Configuring chrony time service]
81-
82-
include::modules/installation-dns-user-infra.adoc[leveloffset=+2]
83-
84-
include::modules/installation-load-balancing-user-infra.adoc[leveloffset=+2]
85-
8636
include::modules/installation-infrastructure-user-infra.adoc[leveloffset=+1]
8737

8838
include::modules/installation-user-provisioned-validating-dns.adoc[leveloffset=+1]

‎installing/installing_vsphere/upi/installing-vsphere.adoc

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -33,56 +33,6 @@ Be sure to also review this site list if you are configuring a proxy.
3333

3434
include::modules/cluster-entitlements.adoc[leveloffset=+1]
3535

36-
include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
37-
38-
include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
39-
40-
[role="_additional-resources"]
41-
.Additional resources
42-
43-
* 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].
44-
* 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].
45-
46-
[id="installation-requirements-user-infra_{context}"]
47-
== Requirements for a cluster with user-provisioned infrastructure
48-
49-
For a cluster that contains user-provisioned infrastructure, you must deploy all
50-
of the required machines.
51-
52-
This section describes the requirements for deploying {product-title} on user-provisioned infrastructure.
53-
54-
include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+2]
55-
56-
[role="_additional-resources"]
57-
.Additional resources
58-
* xref:../../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere_creating-machineset-vsphere[Creating a compute machine set on vSphere]
59-
60-
include::modules/installation-machine-requirements.adoc[leveloffset=+2]
61-
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
62-
63-
[role="_additional-resources"]
64-
.Additional resources
65-
66-
* xref:../../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage]
67-
68-
include::modules/installation-vsphere-encrypted-vms.adoc[leveloffset=+2]
69-
[role="_additional-resources"]
70-
.Additional resources
71-
* xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#vsphere-pv-encryption[Creating an encrypted storage class]
72-
73-
include::modules/csr-management.adoc[leveloffset=+2]
74-
75-
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
76-
77-
[role="_additional-resources"]
78-
.Additional resources
79-
80-
* xref:../../../installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Configuring chrony time service]
81-
82-
include::modules/installation-dns-user-infra.adoc[leveloffset=+2]
83-
84-
include::modules/installation-load-balancing-user-infra.adoc[leveloffset=+2]
85-
8636
include::modules/installation-infrastructure-user-infra.adoc[leveloffset=+1]
8737

8838
include::modules/installation-user-provisioned-validating-dns.adoc[leveloffset=+1]

‎installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="upi-vsphere-installation-reqs"]
3+
= vSphere installation requirements for user-provisioned infrastructure
4+
include::_attributes/common-attributes.adoc[]
5+
:context: upi-vsphere-installation-reqs
6+
7+
toc::[]
8+
9+
Before you begin an installation on infrastructure that you provision, be sure that your vSphere environment meets the following installation requirements.
10+
11+
include::modules/installation-vsphere-infrastructure.adoc[leveloffset=+1]
12+
include::modules/vmware-csi-driver-reqs.adoc[leveloffset=+1]
13+
14+
[role="_additional-resources"]
15+
.Additional resources
16+
17+
* 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].
18+
* 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].
19+
20+
[id="reqs-for-a-cluster-with-user-provisioned-infrastructure_upi-vsphere-installation-reqs"]
21+
== Requirements for a cluster with user-provisioned infrastructure
22+
23+
For a cluster that contains user-provisioned infrastructure, you must deploy all of the required machines.
24+
25+
This section describes the requirements for deploying {product-title} on user-provisioned infrastructure.
26+
27+
include::modules/installation-vsphere-installer-infra-requirements.adoc[leveloffset=+2]
28+
29+
[role="_additional-resources"]
30+
.Additional resources
31+
* xref:../../../machine_management/creating_machinesets/creating-machineset-vsphere.adoc#creating-machineset-vsphere_creating-machineset-vsphere[Creating a compute machine set on vSphere]
32+
33+
include::modules/installation-machine-requirements.adoc[leveloffset=+2]
34+
include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
35+
36+
[role="_additional-resources"]
37+
.Additional resources
38+
39+
* xref:../../../scalability_and_performance/optimization/optimizing-storage.adoc#optimizing-storage[Optimizing storage]
40+
41+
include::modules/installation-vsphere-encrypted-vms.adoc[leveloffset=+2]
42+
[role="_additional-resources"]
43+
.Additional resources
44+
* xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#vsphere-pv-encryption[Creating an encrypted storage class]
45+
46+
include::modules/csr-management.adoc[leveloffset=+2]
47+
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
48+
49+
[role="_additional-resources"]
50+
.Additional resources
51+
52+
* xref:../../../installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Configuring chrony time service]
53+
54+
include::modules/installation-dns-user-infra.adoc[leveloffset=+2]
55+
include::modules/installation-load-balancing-user-infra.adoc[leveloffset=+2]

‎modules/csr-management.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
// installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
1818
// installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
1919
// installing/installing_platform_agnostic/installing-platform-agnostic.adoc
20-
// installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
21-
// installing/installing_vsphere/installing-vsphere-network-customizations.adoc
22-
// installing/installing_vsphere/installing-vsphere.adoc
2320
// machine_management/adding-rhel-compute.adoc
2421
// machine_management/more-rhel-compute.adoc
2522
// post_installation_configuration/node-tasks.adoc
2623
// installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc
24+
// installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
2725

2826
:_mod-docs-content-type: CONCEPT
2927
[id="csr-management_{context}"]

‎modules/installation-dns-user-infra.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
// * installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc
1414
// * installing/installing_vmc/installing-vmc-user-infra.adoc
1515
// * installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
16-
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
17-
// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
18-
// * installing/installing_vsphere/installing-vsphere.adoc
16+
// * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
1917

2018
ifeval::["{context}" == "installing-ibm-z"]
2119
:ibm-z:

‎modules/installation-load-balancing-user-infra.adoc

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,14 @@
44
// * installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
55
// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
66
// * installing/installing_platform_agnostic/installing-platform-agnostic.adoc
7-
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
8-
// * installing/installing_vsphere/installing-vsphere.adoc
9-
// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
107
// * installing/installing_ibm_z/installing-ibm-z.adoc
118
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
129
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
1310
// * installing/installing_ibm_z/installing-ibm-power.adoc
1411
// * installing/installing_ibm_z/installing-restricted-networks-ibm-power.adoc
1512
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
1613
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
17-
18-
ifeval::["{context}" == "installing-vsphere"]
19-
:vsphere:
20-
endif::[]
21-
22-
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
23-
:vsphere:
24-
endif::[]
25-
26-
ifeval::["{context}" == "installing-vsphere-network-customizations"]
27-
:vsphere:
28-
endif::[]
14+
// * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
2915

3016
ifeval::["{context}" == "installing-ibm-z"]
3117
:ibm-z:
@@ -255,15 +241,6 @@ If you are deploying a three-node cluster with zero compute nodes, the Ingress C
255241
If you are using HAProxy as a load balancer, you can check that the `haproxy` process is listening on ports `6443`, `22623`, `443`, and `80` by running `netstat -nltupe` on the HAProxy node.
256242
====
257243

258-
ifeval::["{context}" == "installing-vsphere"]
259-
:!vsphere:
260-
endif::[]
261-
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
262-
:!vsphere:
263-
endif::[]
264-
ifeval::["{context}" == "installing-vsphere-network-customizations"]
265-
:!vsphere:
266-
endif::[]
267244
ifeval::["{context}" == "installing-ibm-z"]
268245
:!ibm-z:
269246
endif::[]

‎modules/installation-machine-requirements.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010
// * installing/installing_gcp/installing-gcp-user-infra-vpc.adoc
1111
// * installing/installing_gcp/installing-restricted-networks-gcp.adoc
1212
// * installing/installing_platform_agnostic/installing-platform-agnostic.adoc
13-
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
14-
// * installing/installing_vsphere/installing-vsphere.adoc
15-
// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
1613
// * installing/installing_ibm_power/installing-ibm-power.adoc
1714
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
1815
// * installing/installing_ibm_z/installing-ibm-z.adoc
1916
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
2017
// * installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc
18+
// * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
2119

2220
ifeval::["{context}" == "installing-bare-metal"]
2321
:bare-metal:

‎modules/installation-minimum-resource-requirements.adoc

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
// * installing/installing_gcp/installing-gcp-user-infra-vpc.adoc
2929
// * installing/installing_gcp/installing-restricted-networks-gcp.adoc
3030
// * installing/installing_platform_agnostic/installing-platform-agnostic.adoc
31-
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
32-
// * installing/installing_vsphere/installing-vsphere.adoc
33-
// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
3431
// * installing/installing_ibm_power/installing-ibm-power.adoc
3532
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
3633
// * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
@@ -44,6 +41,7 @@
4441
// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc
4542
// * installing/installing-restricted-networks-azure-installer-provisioned.adoc
4643
// * installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc
44+
// * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
4745

4846
ifeval::["{context}" == "installing-azure-customizations"]
4947
:azure:
@@ -108,13 +106,7 @@ endif::[]
108106
ifeval::["{context}" == "installing-ibm-cloud-private"]
109107
:ibm-cloud-vpc:
110108
endif::[]
111-
ifeval::["{context}" == "installing-vsphere"]
112-
:vsphere:
113-
endif::[]
114-
ifeval::["{context}" == "installing-vsphere-network-customizations"]
115-
:vsphere:
116-
endif::[]
117-
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
109+
ifeval::["{context}" == "upi-vsphere-installation-reqs"]
118110
:vsphere:
119111
endif::[]
120112

@@ -307,12 +299,6 @@ endif::[]
307299
ifeval::["{context}" == "installing-ibm-cloud-private"]
308300
:!ibm-cloud-vpc:
309301
endif::[]
310-
ifeval::["{context}" == "installing-vsphere"]
311-
:!vsphere:
312-
endif::[]
313-
ifeval::["{context}" == "installing-vsphere-network-customizations"]
314-
:!vsphere:
315-
endif::[]
316-
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
302+
ifeval::["{context}" == "upi-vsphere-installation-reqs"]
317303
:!vsphere:
318304
endif::[]

0 commit comments

Comments
 (0)