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..1c5bdfae09d8 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,25 +6,26 @@ 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"] == 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 have completed the tasks in "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 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 xref:../../../disconnected/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[created a registry on your mirror host] and obtained the `imageContentSources` data for your version of {product-title}. +* You reviewed details about the {product-title} installation and update processes. +* You read the documentation on selecting a cluster installation method and preparing it for users. +* You created a registry on your mirror host and obtained the `imageContentSources` data for your version of {product-title}. + [IMPORTANT] ==== Because the installation media is on the mirror host, you can use that computer to complete all installation steps. ==== -* 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 the ReadWriteMany access mode. +* You provisioned persistent storage for your cluster. To deploy a private image registry, your storage must provide the ReadWriteMany access mode. * The {product-title} installer requires access to port 443 on the vCenter and ESXi hosts. You verified that port 443 is accessible. * If you use a firewall, you confirmed with the administrator that port 443 is accessible. Control plane nodes must be able to reach vCenter and ESXi hosts on port 443 for the installation to succeed. -* If you use a firewall and plan to use the Telemetry service, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall-module_configuring-firewall[configured the firewall to allow the sites] that your cluster requires access to. +* If you use a firewall and plan to use the Telemetry service, you configured the firewall to allow the sites that your cluster requires access to. + [NOTE] ==== @@ -79,28 +80,25 @@ 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 +include::modules/registry-removed.adoc[leveloffset=+1] -After you install the cluster, you must create storage for the Registry Operator. +include::modules/installation-registry-storage-config.adoc[leveloffset=+1] -include::modules/registry-removed.adoc[leveloffset=+2] - -include::modules/installation-registry-storage-config.adoc[leveloffset=+2] - -include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] +include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+2] 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 - -[id="next-steps_installing-restricted-networks-installer-provisioned-vsphere"] -== Next steps - -* xref:../../../installing/install_config/installing-customizing.adoc#installing-customizing[Customize your cluster]. -* If necessary, you can xref:../../../support/remote_health_monitoring/remote-health-reporting.adoc#remote-health-reporting[Remote health reporting]. -* If necessary, see xref:../../../support/remote_health_monitoring/remote-health-reporting.adoc#insights-operator-register-disconnected-cluster_remote-health-reporting[Registering your disconnected cluster]. -* xref:../../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage]. +* 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] +* xref:../../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update processes] +* xref:../../../installing/overview/installing-preparing.adoc#installing-preparing[Selecting a cluster installation method and preparing it for users] +* xref:../../../disconnected/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[Creating a registry on your mirror host] +* xref:../../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Persistent storage] +* xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall-module_configuring-firewall[Configuring the firewall to allow required sites] +* xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] +* xref:../../../installing/install_config/installing-customizing.adoc#installing-customizing[Customize your cluster] +* xref:../../../support/remote_health_monitoring/remote-health-reporting.adoc#remote-health-reporting[Remote health reporting] +* xref:../../../support/remote_health_monitoring/remote-health-reporting.adoc#insights-operator-register-disconnected-cluster_remote-health-reporting[Registering your disconnected cluster] +* xref:../../../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Set up your registry and configure registry storage] 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..146bcd0ad8d0 100644 --- a/modules/installation-vsphere-regions-zones.adoc +++ b/modules/installation-vsphere-regions-zones.adoc @@ -10,7 +10,10 @@ [id="installation-vsphere-regions-zones_{context}"] = VMware vSphere region and zone enablement -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. +[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/olm-restricted-networks-configuring-operatorhub.adoc b/modules/olm-restricted-networks-configuring-operatorhub.adoc index 547d04fa96cd..da47b4ebe762 100644 --- a/modules/olm-restricted-networks-configuring-operatorhub.adoc +++ b/modules/olm-restricted-networks-configuring-operatorhub.adoc @@ -33,7 +33,6 @@ endif::[] = 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. endif::[] @@ -44,6 +43,8 @@ ifdef::olm-managing-custom-catalogs[] As a cluster administrator, you can disable the set of default catalogs. endif::[] +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. + .Procedure * Disable the sources for the default catalogs by adding `disableAllDefaultSources: true` to the `OperatorHub` object: