diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index a5fe628000bf..761f4fdfccaa 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -617,8 +617,6 @@ Topics: 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 disconnected environment File: installing-restricted-networks-installer-provisioned-vsphere - Name: User-provisioned infrastructure diff --git a/installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc b/installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc index 8df9114e8034..251d36ea8b64 100644 --- a/installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc +++ b/installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc @@ -8,13 +8,17 @@ include::_attributes/common-attributes.adoc[] toc::[] In {product-title} version {product-version}, you can install a cluster on your -VMware vSphere instance by using installer-provisioned infrastructure. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster. +{vmw-first} instance by using installer-provisioned infrastructure with customizations, including network configuration options. In each, you modify parameters in the `install-config.yaml` file before you install the cluster. + +By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. + +You must set most of the network configuration parameters during installation, and you can modify only `kubeProxy` configuration parameters in a running cluster. [id="prerequisites_installing-vsphere-installer-provisioned-customizations"] == Prerequisites * You have completed the tasks in xref:../../../installing/installing_vsphere/ipi/ipi-vsphere-preparing-to-install.adoc#ipi-vsphere-preparing-to-install[Preparing to install a cluster using installer-provisioned infrastructure]. -* You reviewed your VMware platform licenses. Red{nbsp}Hat does not place any restrictions on your VMware licenses, but some VMware infrastructure components require licensing. +* You reviewed your {vmw-short} platform licenses. Red{nbsp}Hat does not place any restrictions on your {vmw-short} licenses, but some {vmw-short} infrastructure components require licensing. * You reviewed details about the xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. * You read the documentation on xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users]. * You provisioned xref:../../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] for your cluster. To deploy a private image registry, your storage must provide `ReadWriteMany` access modes. @@ -36,13 +40,13 @@ include::modules/installation-vsphere-regions-zones-host-groups.adoc[leveloffset [role="_additional-resources"] .Additional resources -* xref:../../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc#installation-configuration-parameters-additional-vsphere_installation-config-parameters-vsphere[Additional VMware vSphere configuration parameters] +* xref:../../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc#installation-configuration-parameters-additional-vsphere_installation-config-parameters-vsphere[Additional {vmw-full} configuration parameters] -* xref:../../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc#deprecated-parameters-vsphere_installation-config-parameters-vsphere[Deprecated VMware vSphere configuration parameters] +* xref:../../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc#deprecated-parameters-vsphere_installation-config-parameters-vsphere[Deprecated {vmw-full} configuration parameters] -* xref:../../../storage/container_storage_interface/persistent-storage-csi-migration.adoc#persistent-storage-csi-migration-sc-vsphere_persistent-storage-csi-migration[vSphere automatic migration] +* xref:../../../storage/container_storage_interface/persistent-storage-csi-migration.adoc#persistent-storage-csi-migration-sc-vsphere_persistent-storage-csi-migration[{vmw-short}automatic migration] -* xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-top-aware_persistent-storage-csi-vsphere[VMware vSphere CSI Driver Operator] +* xref:../../../storage/container_storage_interface/persistent-storage-csi-vsphere.adoc#persistent-storage-csi-vsphere-top-aware_persistent-storage-csi-vsphere[{vmw-full} CSI Driver Operator] * xref:../../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates] @@ -56,6 +60,8 @@ include::modules/installation-installer-provisioned-vsphere-config-yaml.adoc[lev include::modules/installation-configure-proxy.adoc[leveloffset=+2] +include::modules/ipi-install-modifying-install-config-for-dual-stack-network.adoc[leveloffset=+2] + include::modules/configuring-vsphere-regions-zones.adoc[leveloffset=+2] include::modules/configuring-vsphere-host-groups.adoc[leveloffset=+2] @@ -64,6 +70,31 @@ include::modules/configuring-vsphere-host-groups.adoc[leveloffset=+2] .Additional resources * xref:../../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates] +// Specifying multiple NICS +include::modules/installation-vsphere-multiple-nics.adoc[leveloffset=+2] + +[role="_additional-resources"] +.Additional resources + +* xref:../../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc#installation-configuration-parameters-network_installation-config-parameters-vsphere[Network configuration parameters] + +// Network configuration phases +include::modules/nw-network-config.adoc[leveloffset=+1] + +// Specifying advanced network configuration +include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1] + +// Specifying multiple subnets for your network +include::modules/nw-operator-vsphere-multiple-subnets.adoc[leveloffset=+2] + +[role="_additional-resources"] +.Additional resources + +* xref:../../../rest_api/config_apis/infrastructure-config-openshift-io-v1.adoc#spec-platformspec-vsphere-nodenetworking[`.spec.platformSpec.vsphere.nodeNetworking`] + +// Cluster Network Operator configuration +include::modules/nw-operator-cr.adoc[leveloffset=+1] + // Services for a user-managed load balancer include::modules/nw-osp-services-external-load-balancer.adoc[leveloffset=+1] @@ -96,6 +127,8 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1] * 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 +include::modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc[leveloffset=+1] + [id="next-steps_installing-vsphere-installer-provisioned-customizations"] == Next steps @@ -103,4 +136,4 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1] * If necessary, you can xref:../../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting]. * xref:../../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage]. -* Optional: xref:../../../installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc#vsphere-problem-detector-viewing-events_vsphere-problem-detector[View the events from the vSphere Problem Detector Operator] to determine if the cluster has permission or storage configuration issues. +* Optional: xref:../../../installing/installing_vsphere/using-vsphere-problem-detector-operator.adoc#vsphere-problem-detector-viewing-events_vsphere-problem-detector[View the events from the {vmw-short} Problem Detector Operator] to determine if the cluster has permission or storage configuration issues. diff --git a/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc b/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc index 246bba9dfea3..6cd24dd37498 100644 --- a/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc +++ b/installing/installing_vsphere/preparing-to-install-on-vsphere.adoc @@ -30,8 +30,6 @@ Installer-provisioned infrastructure is useful for installing in environments wi * **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. -* **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. - * **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. You can use this method to deploy {product-title} on an internal network that is not visible to the internet. @@ -41,9 +39,7 @@ You can install {product-title} on vSphere by using user-provisioned infrastruct User-provisioned infrastructure requires the user to provision all resources required by {product-title}. If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself. -* **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. - -* **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. +* **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 * **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. diff --git a/installing/overview/installing-preparing.adoc b/installing/overview/installing-preparing.adoc index 3d885b7ba16f..25d8b7aaf306 100644 --- a/installing/overview/installing-preparing.adoc +++ b/installing/overview/installing-preparing.adoc @@ -61,14 +61,14 @@ If you need to perform basic configuration for your installer-provisioned infras 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. -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. +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. 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]. 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. -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. +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. [id="installing-preparing-security"] @@ -184,7 +184,7 @@ ifndef::openshift-origin[] | |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[✓] |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[✓] -|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[✓] +|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓] |xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓] | | @@ -340,7 +340,7 @@ ifdef::openshift-origin[] | | | -|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[✓] +|xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[✓] |xref:../../installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc#installing-ibm-cloud-network-customizations[✓] | | diff --git a/modules/cli-logging-in-kubeadmin.adoc b/modules/cli-logging-in-kubeadmin.adoc index 8e1c69350b9a..f3ac57bac818 100644 --- a/modules/cli-logging-in-kubeadmin.adoc +++ b/modules/cli-logging-in-kubeadmin.adoc @@ -47,7 +47,6 @@ // * installing/installing_vsphere/installing-vsphere.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 // * installing/installing_ibm_z/installing-ibm-z.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc diff --git a/modules/cluster-entitlements.adoc b/modules/cluster-entitlements.adoc index 1f5e2a631b74..ce8548fe4398 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -4,7 +4,6 @@ // * installing/installing_bare_metal/upi/installing-bare-metal.adoc // * installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.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 // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc // * installing/installing_vsphere/installing-vsphere.adoc diff --git a/modules/cluster-telemetry.adoc b/modules/cluster-telemetry.adoc index 425d5f5b8930..84b2e3f3069a 100644 --- a/modules/cluster-telemetry.adoc +++ b/modules/cluster-telemetry.adoc @@ -4,7 +4,6 @@ // * installing/installing_bare_metal/upi/installing-bare-metal.adoc // * installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.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 // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc // * installing/installing_vsphere/installing-vsphere.adoc diff --git a/modules/configuring-vsphere-host-groups.adoc b/modules/configuring-vsphere-host-groups.adoc index 639e1a7fe9e6..dcbd85e5658c 100644 --- a/modules/configuring-vsphere-host-groups.adoc +++ b/modules/configuring-vsphere-host-groups.adoc @@ -1,14 +1,13 @@ // Module included in the following assemblies: // //* /installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc -//* /installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc //* /installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc :_mod-docs-content-type: PROCEDURE [id="configuring-vsphere-host-groups_{context}"] = Configuring host groups for a VMware vCenter -:FeatureName: OpenShift zones support for vSphere host groups +:FeatureName: OpenShift zones support for vSphere host groups include::snippets/technology-preview.adoc[] 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. diff --git a/modules/configuring-vsphere-regions-zones.adoc b/modules/configuring-vsphere-regions-zones.adoc index 3a07866e7980..6b2ea8d99b53 100644 --- a/modules/configuring-vsphere-regions-zones.adoc +++ b/modules/configuring-vsphere-regions-zones.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // //* installing/Installing-vsphere-installer-provisioned-customizations.adoc [IPI] -//* installing/installing-vsphere-installer-provisioned-network-customizations.adoc [IPI] //* installing/installing-vsphere.adoc [UPI] //* installing/installing-vsphere-network-customizations.adoc [UPI] //* installing/installing-restricted-networks-installer-provisioned-vsphere.adoc [IPI] diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc index 17a987408bb7..4f62e7a2302c 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -37,10 +37,9 @@ // * installing/installing_openstack/installing-openstack-installer-restricted.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-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc -// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc +// * installing/installing_vsphere/ +//installing-restricted-networks-installer-provisioned-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc // * installing/installing_ibm_z/installing-ibm-z-kvm.adoc @@ -121,9 +120,6 @@ endif::[] ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :vsphere: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:vsphere: -endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] :vsphere: endif::[] @@ -292,9 +288,6 @@ endif::[] ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :!vsphere: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:!vsphere: -endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] :!vsphere: endif::[] diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc index dfb7ebcc3ad9..90e9417380a2 100644 --- a/modules/installation-initializing.adoc +++ b/modules/installation-initializing.adoc @@ -6,7 +6,6 @@ // * installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc // * installing/installing_aws/installing-aws-outposts-remote-workers.adoc // * installing/installing_azure/installing-azure-customizations.adoc -// * installing/installing_azure/installing-azure-network-customizations // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc @@ -31,7 +30,6 @@ // * installing/installing_vmc/installing-vmc-network-customizations.adoc // * installing/installing_vmc/installing-restricted-networks-vmc.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 // * installing/installing_nutanix/configuring-iam-nutanix.adoc // * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc @@ -62,9 +60,6 @@ ifeval::["{context}" == "installing-azure-customizations"] :azure: :three-node-cluster: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:azure: -endif::[] ifeval::["{context}" == "installing-azure-vnet"] :azure: endif::[] @@ -141,9 +136,6 @@ ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations :vsphere: :three-node-cluster: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:vsphere: -endif::[] ifeval::["{context}" == "installing-openstack-installer-restricted"] :osp: :restricted: @@ -665,9 +657,6 @@ ifeval::["{context}" == "installing-azure-customizations"] :!azure: :!three-node-cluster: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!azure: -endif::[] ifeval::["{context}" == "installing-azure-vnet"] :!azure: endif::[] @@ -744,9 +733,6 @@ ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations :!vsphere: :!three-node-cluster: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:!vsphere: -endif::[] ifeval::["{context}" == "installing-openstack-installer-restricted"] :!osp: :!restricted: diff --git a/modules/installation-installer-provisioned-vsphere-config-yaml.adoc b/modules/installation-installer-provisioned-vsphere-config-yaml.adoc index 6634ac05444c..d8bd55f68ee6 100644 --- a/modules/installation-installer-provisioned-vsphere-config-yaml.adoc +++ b/modules/installation-installer-provisioned-vsphere-config-yaml.adoc @@ -1,11 +1,10 @@ // Module included in the following assemblies: // // * 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 -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:network: +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] +:customization: endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] :restricted: @@ -35,7 +34,7 @@ controlPlane: <2> metadata: creationTimestamp: null name: test <3> -ifdef::network[] +ifdef::customization[] networking: clusterNetwork: - cidr: 10.128.0.0/14 @@ -45,7 +44,7 @@ networking: networkType: OVNKubernetes <11> serviceNetwork: - 172.30.0.0/16 -endif::network[] +endif::customization[] platform: vsphere: <4> apiVIPs: @@ -124,9 +123,9 @@ If you must specify VMs across multiple datastores, use a `datastore` object to <8> Optional: Each VM created by {product-title} is assigned a unique tag that is specific to the cluster. The assigned tag enables the installation program to identify and remove the associated VMs when a cluster is decommissioned. You can list up to ten additional tag IDs to be attached to the VMs provisioned by the installation program. <9> The ID of the tag to be associated by the installation program. For example, `urn:vmomi:InventoryServiceTag:208e713c-cae3-4b7f-918e-4051ca7d1f97:GLOBAL`. For more information about determining the tag ID, see the link:https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vcenterhost.doc/GUID-E8E854DD-AA97-4E0C-8419-CE84F93C4058.html[vSphere Tags and Attributes documentation]. <10> The vSphere disk provisioning method. -ifdef::network[] +ifdef::customization[] <11> The cluster network plugin to install. The default value `OVNKubernetes` is the only supported value. -endif::network[] +endif::customization[] ifdef::restricted[] <11> The location of the {op-system-first} image that is accessible from the bastion server. <12> For ``, specify the registry domain name, and optionally the @@ -142,8 +141,8 @@ endif::restricted[] In {product-title} 4.12 and later, the `apiVIP` and `ingressVIP` configuration settings are deprecated. Instead, use a list format to enter values in the `apiVIPs` and `ingressVIPs` configuration settings. ==== -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:!network: +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] +:!customization: endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] :!restricted: diff --git a/modules/installation-launching-installer.adoc b/modules/installation-launching-installer.adoc index 0edf31731283..19e176f8334d 100644 --- a/modules/installation-launching-installer.adoc +++ b/modules/installation-launching-installer.adoc @@ -33,7 +33,6 @@ // * installing/installing_openstack/installing-openstack-installer-restricted.adoc // * installing/installing_openstack/installing-openstack-installer.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc // * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc // * installing/installing-nutanix-installer-provisioned.adoc @@ -142,11 +141,6 @@ ifeval::["{context}" == "installing-azure-vnet"] :azure: :single-step: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:custom-config: -:azure: -:single-step: -endif::[] ifeval::["{context}" == "installing-azure-private"] :custom-config: :azure: @@ -184,11 +178,6 @@ ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations :vsphere: :single-step: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:custom-config: -:vsphere: -:single-step: -endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] :custom-config: :vsphere: @@ -588,11 +577,6 @@ ifeval::["{context}" == "installing-azure-default"] :!azure: :!azure-default: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!custom-config: -:!azure: -:!single-step: -endif::[] ifeval::["{context}" == "installing-gcp-customizations"] :!custom-config: :!gcp: @@ -673,11 +657,6 @@ ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations :!vsphere: :!single-step: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:!custom-config: -:!vsphere: -:!single-step: -endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] :!custom-config: :!vsphere: diff --git a/modules/installation-registry-storage-config.adoc b/modules/installation-registry-storage-config.adoc index 7ff184d91a89..a11746364727 100644 --- a/modules/installation-registry-storage-config.adoc +++ b/modules/installation-registry-storage-config.adoc @@ -15,12 +15,10 @@ // * installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc // * installing/installing_platform_agnostic/installing-platform-agnostic.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc -// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc // * registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc diff --git a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc index a59791fc1b44..6115f9e1d3ee 100644 --- a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc +++ b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc @@ -71,10 +71,7 @@ ifeval::["{context}" == "installing-vsphere"] :vsphere: :three-node-cluster: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:vsphere: -endif::[] -ifeval::["{context}" == "installing-vsphere-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :vsphere: endif::[] ifeval::["{context}" == "installing-restricted-networks-vsphere"] @@ -550,10 +547,7 @@ ifeval::["{context}" == "installing-vsphere"] :!vsphere: :!three-node-cluster: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] -:!vsphere: -endif::[] -ifeval::["{context}" == "installing-vsphere-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :!vsphere: endif::[] ifeval::["{context}" == "installing-restricted-networks-vsphere"] diff --git a/modules/installation-vsphere-multiple-nics.adoc b/modules/installation-vsphere-multiple-nics.adoc index a81afbc718c0..9a4689400663 100644 --- a/modules/installation-vsphere-multiple-nics.adoc +++ b/modules/installation-vsphere-multiple-nics.adoc @@ -1,12 +1,12 @@ // Module included in the following assemblies: // -// * installing/installing-vsphere-installer-provisioned-network-customizations.adoc +// * installing/installing-vsphere-installer-provisioned-customizations.adoc :_mod-docs-content-type: PROCEDURE [id="installation-vsphere-multiple-nics_{context}"] = Configuring multiple NICs -For scenarios requiring multiple network interface controller (NIC), you can configure multiple network adapters per node. +For scenarios requiring multiple network interface controller (NIC), you can configure multiple network adapters per node. :FeatureName: Configuring multiple NICs include::snippets/technology-preview.adoc[] diff --git a/modules/installation-vsphere-regions-zones-host-groups.adoc b/modules/installation-vsphere-regions-zones-host-groups.adoc index 9015759bf3e5..605d56354536 100644 --- a/modules/installation-vsphere-regions-zones-host-groups.adoc +++ b/modules/installation-vsphere-regions-zones-host-groups.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // //* installing/installing-vsphere-installer-provisioned-customizations.adoc [IPI] -//* installing/installing-vsphere-installer-provisioned-network-customizations.adoc [IPI] //* installing/installing-restricted-networks-installer-provisioned-vsphere.adoc [IPI] :_mod-docs-content-type: CONCEPT diff --git a/modules/installation-vsphere-regions-zones.adoc b/modules/installation-vsphere-regions-zones.adoc index 5015fb638d67..a62ca615b405 100644 --- a/modules/installation-vsphere-regions-zones.adoc +++ b/modules/installation-vsphere-regions-zones.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // //* installing/installing-vsphere-installer-provisioned-customizations.adoc [IPI] -//* installing/installing-vsphere-installer-provisioned-network-customizations.adoc [IPI] //* installing/installing-vsphere.adoc [UPI] //* installing/installing-vsphere-network-customizations.adoc [UPI] //* installing/installing-restricted-networks-installer-provisioned-vsphere.adoc [IPI] diff --git a/modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc b/modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc index b53b3e83e941..a7287417224c 100644 --- a/modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc +++ b/modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc @@ -4,7 +4,7 @@ ifeval::["{context}" == "ipi-install-installation-workflow"] :bare: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :vSphere: endif::[] @@ -118,6 +118,6 @@ If control plane nodes are not schedulable after completing this procedure, depl ifeval::["{context}" == "ipi-install-installation-workflow"] :!bare: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :!vSphere: endif::[] diff --git a/modules/nw-modifying-operator-install-config.adoc b/modules/nw-modifying-operator-install-config.adoc index 046269465461..95f1ba52eabd 100644 --- a/modules/nw-modifying-operator-install-config.adoc +++ b/modules/nw-modifying-operator-install-config.adoc @@ -4,17 +4,16 @@ // * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc // * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc ifeval::["{context}" == "installing-bare-metal-network-customizations"] :ignition-config: endif::[] -ifeval::["{context}" == "installing-vsphere-network-customizations"] +ifeval::["{context}" == "installing-vsphere-customizations"] :ignition-config: :vsphere: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :vsphere-ipi: endif::[] ifeval::["{context}" == "installing-ibm-cloud-network-customizations"] @@ -98,11 +97,11 @@ endif::[] ifeval::["{context}" == "installing-bare-metal-network-customizations"] :!ignition-config: endif::[] -ifeval::["{context}" == "installing-vsphere-network-customizations"] +ifeval::["{context}" == "installing-vsphere-customizations"] :!ignition-config: :!vsphere: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :!vsphere-ipi: endif::[] ifeval::["{context}" == "installing-ibm-cloud-network-customizations"] diff --git a/modules/nw-network-config.adoc b/modules/nw-network-config.adoc index b639dd365af1..47ef6c058d54 100644 --- a/modules/nw-network-config.adoc +++ b/modules/nw-network-config.adoc @@ -9,7 +9,6 @@ // * installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc // * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_gcp/installing-gcp-network-customizations.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index 99f2c555068e..2e3c570a93b7 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -12,8 +12,6 @@ // * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc // * installing/installing_ibm_z/installing-ibm-z-lpar.adoc // * installing/installing_ibm_z/installing-restricted-networks-ibm-z-lpar.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * networking/cluster-network-operator.adoc // * networking/network_security/logging-network-security.adoc // * post_installation_configuration/network-configuration.adoc diff --git a/modules/nw-operator-vsphere-multiple-subnets.adoc b/modules/nw-operator-vsphere-multiple-subnets.adoc index c73ee9276fc0..a251e3fa79ed 100644 --- a/modules/nw-operator-vsphere-multiple-subnets.adoc +++ b/modules/nw-operator-vsphere-multiple-subnets.adoc @@ -1,13 +1,12 @@ // Module included in the following assemblies: // -// * installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc -// * installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc +// * installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc :_mod-docs-content-type: PROCEDURE [id="nw-operator-vsphere-multiple-subnets_{context}"] = Specifying multiple subnets for your network -Before you install an {product-title} cluster on a {vmw-short} host, you can specify multiple subnets for a networking implementation so that the {vmw-short} cloud controller manager (CCM) can select the appropriate subnet for a given networking situation. {vmw-short} can use the subnet for managing pods and services on your cluster. +Before you install an {product-title} cluster on a {vmw-short} host, you can specify multiple subnets for a networking implementation so that the {vmw-short} cloud controller manager (CCM) can select the appropriate subnet for a given networking situation. {vmw-short} can use the subnet for managing pods and services on your cluster. For this configuration, you must specify internal and external Classless Inter-Domain Routing (CIDR) implementations in the {vmw-short} CCM configuration. Each CIDR implementation lists an IP address range that the CCM uses to decide what subnets interact with traffic from internal and external networks. diff --git a/modules/nw-osp-configuring-external-load-balancer.adoc b/modules/nw-osp-configuring-external-load-balancer.adoc index 5cb4e306bb80..ed38b5f11f60 100644 --- a/modules/nw-osp-configuring-external-load-balancer.adoc +++ b/modules/nw-osp-configuring-external-load-balancer.adoc @@ -9,7 +9,6 @@ // * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc // vSphere // * installing/installing-vsphere-installer-provisioned-customizations.adoc -// * installing/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing-restricted-networks-installer-provisioned-vsphere.adoc ifeval::["{context}" == "ipi-install-installation-workflow"] @@ -24,7 +23,7 @@ endif::[] ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :vsphere: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :vsphere: endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] @@ -461,7 +460,7 @@ endif::[] ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :!vsphere: endif::[] -ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] +ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"] :!vsphere: endif::[] ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"] diff --git a/modules/nw-osp-services-external-load-balancer.adoc b/modules/nw-osp-services-external-load-balancer.adoc index dffba8c21e34..b5d95a6382a9 100644 --- a/modules/nw-osp-services-external-load-balancer.adoc +++ b/modules/nw-osp-services-external-load-balancer.adoc @@ -9,7 +9,6 @@ // * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc // vSphere // * installing/installing-vsphere-installer-provisioned-customizations.adoc -// * installing/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing-restricted-networks-installer-provisioned-vsphere.adoc :_mod-docs-content-type: CONCEPT diff --git a/modules/persistent-storage-vsphere-backup.adoc b/modules/persistent-storage-vsphere-backup.adoc index 42d693aea829..748d5c453363 100644 --- a/modules/persistent-storage-vsphere-backup.adoc +++ b/modules/persistent-storage-vsphere-backup.adoc @@ -3,9 +3,7 @@ // * storage/persistent_storage/persistent-storage-vsphere.adoc // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc -// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/registry-configuring-storage-vsphere.adoc b/modules/registry-configuring-storage-vsphere.adoc index a3b91a204ff3..a28cb702fe81 100644 --- a/modules/registry-configuring-storage-vsphere.adoc +++ b/modules/registry-configuring-storage-vsphere.adoc @@ -3,7 +3,6 @@ // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc // * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc // * registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc diff --git a/modules/registry-removed.adoc b/modules/registry-removed.adoc index b93ef29f5948..778a26374e0e 100644 --- a/modules/registry-removed.adoc +++ b/modules/registry-removed.adoc @@ -7,10 +7,8 @@ // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc // * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc -// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * registry/configuring-registry-operator.adoc // * registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc // * registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc diff --git a/snippets/vcenter-support.adoc b/snippets/vcenter-support.adoc index 1101155977b7..5bd7512036d4 100644 --- a/snippets/vcenter-support.adoc +++ b/snippets/vcenter-support.adoc @@ -3,9 +3,7 @@ // * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc -// * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc -// * installing/installing_vsphere/installing-vsphere-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere.adoc :_mod-docs-content-type: SNIPPET diff --git a/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc b/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc index 590c3c4eece0..f6e0fe2fbe4e 100644 --- a/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc +++ b/storage/container_storage_interface/persistent-storage-csi-vsphere.adoc @@ -78,7 +78,7 @@ include::modules/persistent-storage-csi-vsphere-multi-vcenter-support-overview.a include::modules/persistent-storage-csi-vsphere-multi-vcenter-support-procedure-install.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -[id="link_installation_config_parameters_vsphere"] +[id="link_installation_config_parameters_vsphere"] * xref:../../installing/installing_vsphere/installation-config-parameters-vsphere.adoc[Installation configuration parameters for vSphere]. include::modules/persistent-storage-csi-vsphere-top-aware-overview.adoc[leveloffset=+1] @@ -86,7 +86,7 @@ include::modules/persistent-storage-csi-vsphere-top-aware-overview.adoc[leveloff include::modules/persistent-storage-csi-vsphere-top-aware-during-install.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-network-customizations.adoc#configuring-vsphere-regions-zones_installing-vsphere-installer-provisioned-network-customizations[Configuring regions and zones for a VMware vCenter] +* xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#configuring-vsphere-regions-zones_installing-vsphere-installer-provisioned-customizations[Configuring regions and zones for a VMware vCenter] include::modules/persistent-storage-csi-vsphere-top-aware-post-install.adoc[leveloffset=+2] [role="_additional-resources"]