Skip to content

Commit f796e50

Browse files
OSDOCS-15374:combining vSphere customization assemblies
1 parent b61abc3 commit f796e50

18 files changed

+45
-78
lines changed

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ include::modules/installation-installer-provisioned-vsphere-config-yaml.adoc[lev
5656

5757
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5858

59+
include::modules/ipi-install-modifying-install-config-for-dual-stack-network.adoc[leveloffset=+2]
60+
5961
include::modules/configuring-vsphere-regions-zones.adoc[leveloffset=+2]
6062

6163
include::modules/configuring-vsphere-host-groups.adoc[leveloffset=+2]
@@ -64,6 +66,31 @@ include::modules/configuring-vsphere-host-groups.adoc[leveloffset=+2]
6466
.Additional resources
6567
* xref:../../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates]
6668

69+
// Specifying multiple NICS
70+
include::modules/installation-vsphere-multiple-nics.adoc[leveloffset=+2]
71+
72+
[role="_additional-resources"]
73+
.Additional resources
74+
75+
* xref:../../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc#installation-configuration-parameters-network_installation-config-parameters-vsphere[Network configuration parameters]
76+
77+
// Network configuration phases
78+
include::modules/nw-network-config.adoc[leveloffset=+1]
79+
80+
// Specifying advanced network configuration
81+
include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
82+
83+
// Specifying multiple subnets for your network
84+
include::modules/nw-operator-vsphere-multiple-subnets.adoc[leveloffset=+2]
85+
86+
[role="_additional-resources"]
87+
.Additional resources
88+
89+
* xref:../../../rest_api/config_apis/infrastructure-config-openshift-io-v1.adoc#spec-platformspec-vsphere-nodenetworking[`.spec.platformSpec.vsphere.nodeNetworking`]
90+
91+
// Cluster Network Operator configuration
92+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
93+
6794
// Services for a user-managed load balancer
6895
include::modules/nw-osp-services-external-load-balancer.adoc[leveloffset=+1]
6996

@@ -96,6 +123,8 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1]
96123

97124
* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service
98125

126+
include::modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc[leveloffset=+1]
127+
99128
[id="next-steps_installing-vsphere-installer-provisioned-customizations"]
100129
== Next steps
101130

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ Installer-provisioned infrastructure is useful for installing in environments wi
3030

3131
* **xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[Installing a cluster on vSphere with customizations]**: You can install {product-title} on vSphere by using installer-provisioned infrastructure installation with the default customization options.
3232

33-
* **xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[Installing a cluster on vSphere with network customizations]**: You can install {product-title} on installer-provisioned vSphere infrastructure, with network customizations. You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements.
34-
3533
* **xref:../../installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc#installing-restricted-networks-installer-provisioned-vsphere[Installing a cluster on vSphere in a restricted network]**: You can install a cluster on VMware vSphere infrastructure in a restricted network by creating an internal mirror of the installation release content.
3634
You can use this method to deploy {product-title} on an internal network that is not visible to the internet.
3735

@@ -41,9 +39,7 @@ You can install {product-title} on vSphere by using user-provisioned infrastruct
4139
User-provisioned infrastructure requires the user to provision all resources required by {product-title}.
4240
If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself.
4341

44-
* **xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[Installing a cluster on vSphere with user-provisioned infrastructure]**: You can install {product-title} on VMware vSphere infrastructure that you provision.
45-
46-
* **xref:../../installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[Installing a cluster on vSphere with network customizations with user-provisioned infrastructure]**: You can install {product-title} on VMware vSphere infrastructure that you provision with customized network configuration options.
42+
* **xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[Installing a cluster on vSphere with user-provisioned infrastructure]**: You can install {product-title} on VMware vSphere infrastructure that you provision or you can install {product-title} on VMware vSphere infrastructure that you provision with customized network configuration options
4743

4844
* **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.
4945

installing/overview/installing-preparing.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ If you need to perform basic configuration for your installer-provisioned infras
6161
For installer-provisioned infrastructure installations, you can use an existing xref:../../installing/installing_aws/ipi/installing-aws-vpc.adoc#installing-aws-vpc[VPC in AWS], xref:../../installing/installing_azure/ipi/installing-azure-vnet.adoc#installing-azure-vnet[vNet in Azure], or xref:../../installing/installing_gcp/installing-gcp-vpc.adoc#installing-gcp-vpc[VPC in GCP]. You can also reuse part of your networking infrastructure so that your cluster in xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-network-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Azure], xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[GCP] can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. If you have existing accounts and credentials on these clouds, you can re-use them, but you might need to modify the accounts to have the required permissions to install {product-title} clusters on them.
6262

6363

64-
You can use the installer-provisioned infrastructure method to create appropriate machine instances on your hardware for xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc#installing-vsphere-installer-provisioned[vSphere], and xref:../../installing/installing_bare_metal/ipi/ipi-install-overview.adoc#ipi-install-overview[bare metal]. Additionally, for xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[vSphere], you can also customize additional network parameters during installation.
64+
You can use the installer-provisioned infrastructure method to create appropriate machine instances on your hardware for xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc#installing-vsphere-installer-provisioned[vSphere], and xref:../../installing/installing_bare_metal/ipi/ipi-install-overview.adoc#ipi-install-overview[bare metal]. Additionally, for xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[vSphere], you can also customize additional network parameters during installation.
6565

6666
For some installer-provisioned infrastructure installations, for example on the {vmw-first} and bare metal platforms, the external traffic that reaches the ingress virtual IP (VIP) is not balanced between the default `IngressController` replicas. For {vmw-short} and bare metal installer-provisioned infrastructure installations where exceeding the baseline `IngressController` router performance is expected, you must configure an external load balancer. Configuring an external load balancer achieves the performance of multiple `IngressController` replicas. For more information about the baseline `IngressController` performance, see xref:../../scalability_and_performance/optimization/routing-optimization.adoc#baseline-router-performance_routing-optimization[Baseline Ingress Controller (router) performance]. For more information about configuring an external load balancer, see xref:../../installing/installing_bare_metal/ipi/ipi-install-installation-workflow.adoc#nw-osp-configuring-external-load-balancer_ipi-install-installation-workflow[Configuring a user-managed load balancer].
6767

6868
If you want to reuse extensive cloud infrastructure, you can complete a _user-provisioned infrastructure_ installation. With these installations, you manually deploy the machines that your cluster requires during the installation process. If you perform a user-provisioned infrastructure installation on xref:../../installing/installing_aws/upi/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS], xref:../../installing/installing_azure/upi/installing-azure-user-infra.adoc#installing-azure-user-infra[Azure], xref:../../installing/installing_azure_stack_hub/upi/installing-azure-stack-hub-user-infra.adoc#installing-azure-stack-hub-user-infra[Azure Stack Hub], you can use the provided templates to help you stand up all of the required components. You can also reuse a shared xref:../../installing/installing_gcp/installing-gcp-user-infra-vpc.adoc#installing-gcp-user-infra-vpc[VPC on GCP]. Otherwise, you can use the xref:../../installing/installing_platform_agnostic/installing-platform-agnostic.adoc#installing-platform-agnostic[provider-agnostic] installation method to deploy a cluster into other clouds.
6969

7070

71-
You can also complete a user-provisioned infrastructure installation on your existing hardware. If you use xref:../../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[{rh-openstack}], xref:../../installing/installing_ibm_z/upi/installing-ibm-z.adoc#installing-ibm-z[{ibm-z-name} or {ibm-linuxone-name}], xref:../../installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibm-z-name} and {ibm-linuxone-name} with {op-system-base} KVM], xref:../../installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc#installing-ibm-z-lpar[{ibm-z-name} and {ibm-linuxone-name} in an LPAR], xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[{ibm-power-title}], or xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[vSphere], use the specific installation instructions to deploy your cluster. If you use other supported hardware, follow the xref:../../installing/installing_bare_metal/upi/installing-bare-metal.adoc#installing-bare-metal[bare metal installation] procedure. For some of these platforms, such as xref:../../installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[vSphere], and xref:../../installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[bare metal], you can also customize additional network parameters during installation.
71+
You can also complete a user-provisioned infrastructure installation on your existing hardware. If you use xref:../../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[{rh-openstack}], xref:../../installing/installing_ibm_z/upi/installing-ibm-z.adoc#installing-ibm-z[{ibm-z-name} or {ibm-linuxone-name}], xref:../../installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[{ibm-z-name} and {ibm-linuxone-name} with {op-system-base} KVM], xref:../../installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc#installing-ibm-z-lpar[{ibm-z-name} and {ibm-linuxone-name} in an LPAR], xref:../../installing/installing_ibm_power/installing-ibm-power.adoc#installing-ibm-power[{ibm-power-title}], or xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[vSphere], use the specific installation instructions to deploy your cluster. If you use other supported hardware, follow the xref:../../installing/installing_bare_metal/upi/installing-bare-metal.adoc#installing-bare-metal[bare metal installation] procedure. For some of these platforms, such as xref:../../installing/installing_vsphere/upi/installing-vsphere.adoc#installing-vsphere[vSphere] and xref:../../installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[bare metal], you can also customize additional network parameters during installation.
7272

7373

7474
[id="installing-preparing-security"]
@@ -184,7 +184,7 @@ ifndef::openshift-origin[]
184184
|
185185
|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[✓]
186186
|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[✓]
187-
|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[✓]
187+
|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓]
188188
|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓]
189189
|
190190
|
@@ -340,7 +340,7 @@ ifdef::openshift-origin[]
340340
|
341341
|
342342
|
343-
|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[✓]
343+
|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓]
344344
|xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓]
345345
|
346346
|

modules/cli-logging-in-kubeadmin.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
// * installing/installing_vsphere/installing-vsphere.adoc
4848
// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
4949
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
50-
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
5150
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
5251
// * installing/installing_ibm_z/installing-ibm-z.adoc
5352
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc

modules/cluster-entitlements.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// * installing/installing_bare_metal/upi/installing-bare-metal.adoc
55
// * installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
66
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
7-
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
87
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
98
// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
109
// * installing/installing_vsphere/installing-vsphere.adoc

modules/cluster-telemetry.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// * installing/installing_bare_metal/upi/installing-bare-metal.adoc
55
// * installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
66
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
7-
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
87
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
98
// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
109
// * installing/installing_vsphere/installing-vsphere.adoc

modules/configuring-vsphere-host-groups.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
// Module included in the following assemblies:
22
//
33
//* /installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
4-
//* /installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc
54
//* /installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
65

76
:_mod-docs-content-type: PROCEDURE
87
[id="configuring-vsphere-host-groups_{context}"]
98
= Configuring host groups for a VMware vCenter
109

11-
:FeatureName: OpenShift zones support for vSphere host groups
10+
:FeatureName: OpenShift zones support for vSphere host groups
1211
include::snippets/technology-preview.adoc[]
1312

1413
You can modify the default installation configuration file to deploy an {product-title} cluster on a {vmw-first} stretched cluster, where ESXi hosts are grouped into host groups by physical location.

modules/configuring-vsphere-regions-zones.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Module included in the following assemblies:
22
//
33
//* installing/Installing-vsphere-installer-provisioned-customizations.adoc [IPI]
4-
//* installing/installing-vsphere-installer-provisioned-network-customizations.adoc [IPI]
54
//* installing/installing-vsphere.adoc [UPI]
65
//* installing/installing-vsphere-network-customizations.adoc [UPI]
76
//* installing/installing-restricted-networks-installer-provisioned-vsphere.adoc [IPI]

modules/installation-configure-proxy.adoc

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@
3737
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
3838
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
3939
// * installing/installing_vsphere/installing-vsphere.adoc
40-
// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
4140
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
42-
// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
43-
// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
41+
// * installing/installing_vsphere/
42+
installing-restricted-networks-installer-provisioned-vsphere.adoc
4443
// * installing/installing_ibm_z/installing-ibm-z.adoc
4544
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
4645
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
@@ -121,9 +120,6 @@ endif::[]
121120
ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"]
122121
:vsphere:
123122
endif::[]
124-
ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"]
125-
:vsphere:
126-
endif::[]
127123
ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
128124
:vsphere:
129125
endif::[]
@@ -292,9 +288,6 @@ endif::[]
292288
ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"]
293289
:!vsphere:
294290
endif::[]
295-
ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"]
296-
:!vsphere:
297-
endif::[]
298291
ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
299292
:!vsphere:
300293
endif::[]

0 commit comments

Comments
 (0)