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 7d168c55b8b4..1cfdeed5e33e 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 @@ -6,6 +6,7 @@ include::_attributes/common-attributes.adoc[] toc::[] +[role="_abstract"] In {product-title} {product-version}, you can install a cluster on VMware vSphere infrastructure in a restricted network by creating an internal mirror of the installation release content. [id="prerequisites_installing-restricted-networks-installer-provisioned-vsphere"] @@ -79,10 +80,7 @@ include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] -[id="installing-vsphere-restricted-networks-installer-provisioned-customizations-registry"] -== Creating registry storage - -After you install the cluster, you must create storage for the Registry Operator. +include::modules/installing-restricted-networks-installer-provisioned-vsphere-registry-reference.adoc[leveloffset=+1] include::modules/registry-removed.adoc[leveloffset=+2] @@ -95,7 +93,7 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* 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 +* xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] [id="next-steps_installing-restricted-networks-installer-provisioned-vsphere"] == Next steps diff --git a/modules/configuring-vsphere-host-groups.adoc b/modules/configuring-vsphere-host-groups.adoc index 951b53c3dfb1..30a82a4241d9 100644 --- a/modules/configuring-vsphere-host-groups.adoc +++ b/modules/configuring-vsphere-host-groups.adoc @@ -7,6 +7,7 @@ [id="configuring-vsphere-host-groups_{context}"] = Configuring host groups for a VMware vCenter +[role="_abstract"] 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. diff --git a/modules/configuring-vsphere-regions-zones.adoc b/modules/configuring-vsphere-regions-zones.adoc index 88da37772cbd..0a38e7cf7255 100644 --- a/modules/configuring-vsphere-regions-zones.adoc +++ b/modules/configuring-vsphere-regions-zones.adoc @@ -10,6 +10,7 @@ [id="configuring-vsphere-regions-zones_{context}"] = Configuring regions and zones for a VMware vCenter +[role="_abstract"] You can modify the default installation configuration file, so that you can deploy an {product-title} cluster to multiple vSphere data centers. The default `install-config.yaml` file configuration from the previous release of {product-title} is deprecated. You can continue to use the deprecated default configuration, but the `openshift-installer` will prompt you with a warning message that indicates the use of deprecated fields in the configuration file. diff --git a/modules/installation-creating-image-restricted.adoc b/modules/installation-creating-image-restricted.adoc index 02bf2b54c3aa..dd5b34bf56c4 100644 --- a/modules/installation-creating-image-restricted.adoc +++ b/modules/installation-creating-image-restricted.adoc @@ -14,6 +14,7 @@ endif::[] [id="installation-creating-image-restricted_{context}"] = Creating the {op-system} image for restricted network installations +[role="_abstract"] Download the {op-system-first} image to install {product-title} on a restricted network ifdef::osp[{rh-openstack-first}] ifdef::vsphere[VMware vSphere] @@ -72,12 +73,14 @@ Depending on your {rh-openstack} environment, you might be able to upload the im ==== If the installation program finds multiple images with the same name, it chooses one of them at random. To avoid this behavior, create unique names for resources in {rh-openstack}. ==== ++ +The image is now available for a restricted installation. Note the image name or location for use in {product-title} deployment. endif::osp[] ifdef::vsphere[] . Upload the image you downloaded to a location that is accessible from the bastion server. -endif::vsphere[] - ++ The image is now available for a restricted installation. Note the image name or location for use in {product-title} deployment. +endif::vsphere[] ifeval::["{context}" == "installing-openstack-installer-restricted"] :!osp: diff --git a/modules/installation-vsphere-regions-zones-host-groups.adoc b/modules/installation-vsphere-regions-zones-host-groups.adoc index aba48e428e18..b8b327dd78d2 100644 --- a/modules/installation-vsphere-regions-zones-host-groups.adoc +++ b/modules/installation-vsphere-regions-zones-host-groups.adoc @@ -7,6 +7,7 @@ [id="installation-vsphere-regions-zones-host-groups_{context}"] = VMware vSphere host group enablement +[role="_abstract"] When deploying an {product-title} cluster to {vmw-first}, you can map your {vmw-short} host groups onto {product-title} failure domains. This is useful if you are using a stretched cluster configuration, where ESXi hosts are grouped into host groups by physical location. To enable this feature, you must meet the following requirements: diff --git a/modules/installation-vsphere-regions-zones.adoc b/modules/installation-vsphere-regions-zones.adoc index 5a554ee8ef4f..b1e943125630 100644 --- a/modules/installation-vsphere-regions-zones.adoc +++ b/modules/installation-vsphere-regions-zones.adoc @@ -10,6 +10,7 @@ [id="installation-vsphere-regions-zones_{context}"] = VMware vSphere region and zone enablement +[role="_abstract"] You can deploy an {product-title} cluster to multiple vSphere data centers. Each data center can run multiple clusters. This configuration reduces the risk of a hardware failure or network outage that can cause your cluster to fail. To enable regions and zones, you must define multiple failure domains for your {product-title} cluster. [IMPORTANT] diff --git a/modules/installing-restricted-networks-installer-provisioned-vsphere-registry-reference.adoc b/modules/installing-restricted-networks-installer-provisioned-vsphere-registry-reference.adoc new file mode 100644 index 000000000000..78d60f552bbd --- /dev/null +++ b/modules/installing-restricted-networks-installer-provisioned-vsphere-registry-reference.adoc @@ -0,0 +1,10 @@ +// Module included in the following assemblies: +// +// * installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc + +:_mod-docs-content-type: REFERENCE +[id="installing-vsphere-restricted-networks-installer-provisioned-customizations-registry_{context}"] += Creating registry storage + +[role="_abstract"] +After you install the cluster, you must create storage for the Registry Operator. diff --git a/modules/olm-restricted-networks-configuring-operatorhub.adoc b/modules/olm-restricted-networks-configuring-operatorhub.adoc index 613a6f9096e1..547d04fa96cd 100644 --- a/modules/olm-restricted-networks-configuring-operatorhub.adoc +++ b/modules/olm-restricted-networks-configuring-operatorhub.adoc @@ -32,6 +32,7 @@ endif::[] [id="olm-restricted-networks-operatorhub_{context}"] = Disabling the default software catalog sources +[role="_abstract"] Operator catalogs that source content provided by Red Hat and community projects are configured for the software catalog by default during an {product-title} installation. ifndef::olm-managing-custom-catalogs[] In a restricted network environment, you must disable the default catalogs as a cluster administrator. @@ -52,7 +53,7 @@ endif::[] $ oc patch OperatorHub cluster --type json \ -p '[{"op": "add", "path": "/spec/disableAllDefaultSources", "value": true}]' ---- - ++ [TIP] ==== Alternatively, you can use the web console to manage catalog sources. From the *Administration* -> *Cluster Settings* -> *Configuration* -> *OperatorHub* page, click the *Sources* tab, where you can create, update, delete, disable, and enable individual sources.