diff --git a/installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc b/installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc index a369fdb31112..4e2dc48e5561 100644 --- a/installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc +++ b/installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc @@ -52,8 +52,6 @@ include::modules/installation-vsphere-regions-zones-host-groups.adoc[leveloffset * 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:../../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates] - include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] @@ -68,10 +66,6 @@ include::modules/configuring-vsphere-regions-zones.adoc[leveloffset=+2] include::modules/configuring-vsphere-host-groups.adoc[leveloffset=+2] -[role="_additional-resources"] -.Additional resources -* xref:../../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates] - // Services for a user-managed load balancer include::modules/nw-osp-services-external-load-balancer.adoc[leveloffset=+1] 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 22a8157486eb..c008e795616a 100644 --- a/installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc +++ b/installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc @@ -48,8 +48,6 @@ include::modules/installation-vsphere-regions-zones-host-groups.adoc[leveloffset * 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] - include::modules/installation-initializing.adoc[leveloffset=+1] [role="_additional-resources"] @@ -66,10 +64,6 @@ include::modules/configuring-vsphere-regions-zones.adoc[leveloffset=+2] include::modules/configuring-vsphere-host-groups.adoc[leveloffset=+2] -[role="_additional-resources"] -.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] diff --git a/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc b/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc index 0a38a216eb89..76dd3c665a57 100644 --- a/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc +++ b/installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc @@ -51,8 +51,4 @@ include::modules/references-regions-zones-infrastructure-vsphere.adoc[leveloffse .Additional resources * xref:../../installing/installing_vsphere/post-install-vsphere-zones-regions-configuration.adoc#specifying-regions-zones-infrastructure-vsphere_post-install-vsphere-zones-regions-configuration[Specifying multiple regions and zones for your cluster on vSphere] -include::modules/specifying-host-groups-vsphere.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources -* xref:../../nodes/clusters/nodes-cluster-enabling-features.adoc#nodes-cluster-enabling[Enabling features using feature gates] \ No newline at end of file +include::modules/specifying-host-groups-vsphere.adoc[leveloffset=+1] \ No newline at end of file diff --git a/modules/configuring-vsphere-host-groups.adoc b/modules/configuring-vsphere-host-groups.adoc index dcbd85e5658c..94373030d3ae 100644 --- a/modules/configuring-vsphere-host-groups.adoc +++ b/modules/configuring-vsphere-host-groups.adoc @@ -7,9 +7,6 @@ [id="configuring-vsphere-host-groups_{context}"] = Configuring host groups for a VMware vCenter -: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. The default `install-config.yaml` file configuration from previous releases of {product-title} is deprecated. Though you can still use it, the {product-title} installer will display a warning message that indicates the use of deprecated fields in the configuration file. @@ -20,7 +17,6 @@ The default `install-config.yaml` file configuration from previous releases of { * You have arranged your ESXi hosts into host groups. * You have granted the `Host.Inventory.EditCluster` privilege on the {vmw-short} vCenter cluster object. * You have downloaded and installed the `govc` command line tool. Instructions can be found on the VMware documentation website. Note that `govc` is an open-source tool that is not maintained by the Red{nbsp}Hat support team. -* You have enabled the `TechPreviewNoUpgrade` feature set. For more information, see "Enabling features using feature gates". + [IMPORTANT] ==== @@ -81,10 +77,6 @@ $ govc tags.attach -c / -vm govc cluster.group.create -name -vm # Create VM-host affinity rules: -govc cluster.rule.create -name -enable -vm-host -vm-group -host-affine-group -govc cluster.rule.create -name -enable -vm-host -vm-group -host-affine-group +govc cluster.rule.create -name -enable -vm-host -vm-group -host-affine-group +govc cluster.rule.create -name -enable -vm-host -vm-group -host-affine-group # Add ESXi hosts to host groups: -govc cluster.group.change -name -govc cluster.group.change -name +govc cluster.group.change -name +govc cluster.group.change -name ---- * `openshift-region` and `openshift-zone` tag categories are created on the vCenter server. * Compute clusters have tags from the `openshift-region` tag category. -* ESXi hosts within host groups have tags from the `openshift-zone` tag category. +* ESXi hosts within host groups have tags from the `openshift-zone` tag category. * `Host.Inventory.EditCluster` privilege is granted on the {vmw-short} vCenter cluster object. -* `TechPreviewNoUpgrade` feature set is enabled. For more information, "see Enabling features using feature gates". .Procedure @@ -51,7 +47,7 @@ govc cluster.group.change -name $ oc get infrastructures.config.openshift.io cluster -o yaml > .yaml ---- + -.. Edit your infrastructure file to include a failure domain for each host group in your {vmw-short} cluster. Refer to the following YAML file for an example of this configuration. Ensure you replace any values wrapped in angle brackets (`< >`) with your values: +.. Edit your infrastructure file to include a failure domain for each host group in your {vmw-short} cluster. Refer to the following YAML file for an example of this configuration. Ensure you replace any values wrapped in angle brackets (`< >`) with your values: + [source,yaml] ----