osdocs-690 entitlement updates

modules/cluster-entitlements.adoc

@@ -21,33 +21,18 @@
 [id="cluster-entitlements_{context}"]
 = Internet and Telemetry access for {product-title}
 
-In {product-title} {product-version}, Telemetry is the component that provides
-metrics about cluster health and the success of updates. To perform subscription
-management, including legally entitling your purchase from Red Hat, you must use
-the Telemetry service and access the
-link:https://cloud.redhat.com/openshift/install[OpenShift Infrastructure Providers] page.
+In {product-title} {product-version}, you require access to the internet to install and entitle your cluster. The Telemetry service, which runs by default to provide metrics about cluster health and the success of updates, also requires internet access. If your cluster is connected to the internet, Telemetry runs automatically, and your cluster is registered to the link:https://cloud.redhat.com/openshift[Red Hat OpenShift Cluster Manager]. From there, you can allocate entitlements to your cluster.
 
-Because there is no disconnected subscription management, you cannot both opt
-out of sending data back to Red Hat and entitle your purchase. Support for
-disconnected subscription management might be added in future releases of
-{product-title}
+You must have internet access to:
 
+* Access the link:https://cloud.redhat.com/openshift[Red Hat OpenShift Cluster Manager] page to download the installation program and perform subscription management and entitlement. If the cluster has internet access and you do not disable Telemetry, that service automatically entitles your cluster. If the Telemetry service cannot entitle your cluster, you must manually entitle it on the link:https://cloud.redhat.com/openshift/register[Cluster registration] page.
+* Access link:http://quay.io[Quay.io] to obtain the packages that are required to install your cluster.
+* Obtain the packages that are required to perform cluster updates.
 ifdef::openshift-origin,openshift-enterprise[]
 
 [IMPORTANT]
 ====
-Your machines must have direct internet access to install the cluster.
+If your cluster cannot have direct internet access, you can perform a restricted network installation on infrastructure that you provision. During that process, you download the content that is required and use it to populate a mirror registry with the packages that you need to install a cluster and generate the installation program. With some installation types, the environment that you install your cluster in will not require internet access. Before you update the cluster, you update the content of the mirror registry.
 ====
 
 endif::openshift-origin,openshift-enterprise[]
-
-You must have internet access to:
-
-* Access the
-link:https://cloud.redhat.com/openshift/install[OpenShift Infrastructure Providers]
-page to download the installation program
-* Access link:http://quay.io[Quay.io] to obtain the packages that are required
-to install your cluster
-* Obtain the packages that are required to perform cluster updates
-* Access link:http://cloud.redhat.com[Red Hat's software as a service page]
-to perform subscription management

modules/installation-about-restricted-network.adoc

@@ -7,7 +7,7 @@
 [id="installation-about-restricted-networks_{context}"]
 = About installations in restricted networks
 
-In {product-title} {version}, you can perform an installation that does not
+In {product-title} {product-version}, you can perform an installation that does not
 require an active connection to the internet to obtain software components. You
 complete an installation in a restricted network on only infrastructure that you provision,
 not infrastructure that the installation program provisions, so your platform selection is

modules/installation-aws-user-infra-installation.adoc

@@ -3,6 +3,10 @@
 // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc
 // * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc
 
+ifeval::["{context}" == "installing-restricted-networks-aws"]
+:restricted:
+endif::[]
+
 [id="installation-aws-user-infra-installation_{context}"]
 = Completing an AWS installation on user-provisioned infrastructure
 
@@ -34,3 +38,7 @@ INFO Waiting up to 30m0s for the cluster to initialize...
 ----
 <1> For `<installation_directory>`, specify the path to the directory that you
 stored the installation files in.
+
+ifdef::restricted[]
+. Register your cluster on the link:https://cloud.redhat.com/openshift/register[Cluster registration] page.
+endif::restricted[]

modules/installation-complete-user-infra.adoc

@@ -5,6 +5,13 @@
 // * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere.adoc
 
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:restricted:
+endif::[]
+
 [id="installation-complete-user-infra_{context}"]
 = Completing installation on user-provisioned infrastructure
 
@@ -91,3 +98,7 @@ command.
 +
 If the Pod logs display, the Kubernetes API server can communicate with the
 cluster machines.
+
+ifdef::restricted[]
+. Register your cluster on the link:https://cloud.redhat.com/openshift/register[Cluster registration] page.
+endif::restricted[]

modules/installation-overview.adoc

@@ -5,19 +5,7 @@
 [id="installation-overview_{context}"]
 = {product-title} installation overview
 
-The {product-title} installation program offers you flexibility. You can use the installation
-program to deploy a cluster on infrastructure that the installation program
-provisions and the cluster maintains or deploy a cluster on infrastructure
-that you prepare and maintain.
-
-[IMPORTANT]
-====
-{product-title} requires all machines, including the computer that you run the
-installation process on, to have direct internet access to pull images
-for platform containers and provide telemetry data to Red Hat.
-
-You cannot specify a proxy server for {product-title}.
-====
+The {product-title} installation program offers you flexibility. You can use the installation program to deploy a cluster on infrastructure that the installation program provisions and the cluster maintains or deploy a cluster on infrastructure that you prepare and maintain.
 
 These two basic types of {product-title} clusters are frequently called
 installer-provisioned infrastructure clusters and user-provisioned
@@ -77,15 +65,25 @@ of new certificates or keys, after installation.
 == Available platforms
 
 In {product-title} {product-version}, you can install a cluster that uses
-installer-provisioned infrastructure on only Amazon Web Services (AWS).
+installer-provisioned infrastructure on the following platforms:
+
+* Amazon Web Services (AWS)
+* Google Cloud Platform (GCP)
+* Microsoft Azure
+* Red Hat OpenStack Platform version 13 and 14
+
+For these clusters, all machines, including the computer that you run the installation process on, must have direct internet access to pull images for platform containers and provide telemetry data to Red Hat.
 
 In {product-title} {product-version}, you can install a cluster that uses
 user-provisioned infrastructure on the following platforms:
 
 * AWS
+* GCP
 * VMware vSphere
 * Bare metal
 
+With installations on user-provisioned infrastructure, each machine can have full internet access, you can place your cluster behind a proxy, or you can perform a _restricted network installation_. In a restricted network installation, you can download the images that are required to install a cluster, place them in a mirror registry, and use that data to install your cluster. While you require internet access to pull images for platform containers, with a restricted network installation on vSphere or bare metal infrastructure, your cluster machines do not require direct internet access.
+
 The link:https://access.redhat.com/articles/4128421[OpenShift Container Platform 4.x Tested Integrations]
 page contains details about integration testing for different platforms.
 

modules/rhel-compute-overview.adoc

@@ -6,30 +6,20 @@
 [id="rhel-compute-overview_{context}"]
 = About adding RHEL compute nodes to a cluster
 
-In {product-title} {product-version}, you have the option of using Red Hat
-Enterprise Linux (RHEL) machines as compute, or worker, machines in your
-cluster if you use a user-provisioned infrastructure installation. You
-must use {op-system-first} machines for the control plane, or
-master, machines in your cluster.
+In {product-title} {product-version}, you have the option of using Red Hat Enterprise Linux (RHEL) machines as compute, or worker, machines in your cluster if you use a user-provisioned infrastructure installation. You must use {op-system-first} machines for the control plane, or master, machines in your cluster.
 
-As with all installations that use user-provisioned infrastructure, if you
-choose to use RHEL compute machines in
-your cluster, you take responsibility for all operating system life cycle
-management and maintenance, including performing system updates, applying
-patches, and completing all other required tasks.
+As with all installations that use user-provisioned infrastructure, if you choose to use RHEL compute machines in your cluster, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks.
 
 [IMPORTANT]
 ====
-Because removing {product-title} from a machine in the cluster requires
-destroying the operating system, you must use dedicated hardware for any
-RHEL machines that you add to the cluster.
+Because removing {product-title} from a machine in the cluster requires destroying the operating system, you must use dedicated hardware for any RHEL machines that you add to the cluster.
 ====
 
 [IMPORTANT]
 ====
-Swap memory is disabled on all RHEL machines that you add to your {product-title}
-cluster. You cannot enable swap memory on these machines.
+Swap memory is disabled on all RHEL machines that you add to your {product-title} cluster. You cannot enable swap memory on these machines.
 ====
 
-You must add RHEL compute machines to the cluster after you initialize the
-control plane.
+You must add any RHEL compute machines to the cluster after you initialize the control plane.
+
+Although you must entitle them for their use of RHEL, RHEL compute machines are exempt from the {product-title} entitlement calculations.