OSDOCS-14094: Applied changes to Preparing your Environment

Author: EricPonvelle

modules/mos-network-prereqs-min-bandwidth.adoc

@@ -7,6 +7,13 @@
 [id="mos-network-prereqs-min-bandwidth_{context}"]
 = Minimum bandwidth
 
-During cluster deployment, {product-title} requires a minimum bandwidth of 120{nbsp}Mbps between cluster infrastructure and the public internet or private network locations that provide deployment artifacts and resources. When network connectivity is slower than 120{nbsp}Mbps (for example, when connecting through a proxy) the cluster installation process times out and deployment fails.
+During cluster deployment, 
+ifdef::openshift-rosa[]
+{rosa-classic-short} 
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+{rosa-short} 
+endif::openshift-rosa-hcp[]
+requires a minimum bandwidth of 120{nbsp}Mbps between cluster infrastructure and the public internet or private network locations that provide deployment artifacts and resources. When network connectivity is slower than 120{nbsp}Mbps (for example, when connecting through a proxy) the cluster installation process times out and deployment fails.
 
 After cluster deployment, network requirements are determined by your workload. However, a minimum bandwidth of 120{nbsp}Mbps helps to ensure timely cluster and operator upgrades.

modules/rosa-hcp-firewall-prerequisites.adoc

@@ -8,7 +8,7 @@
 [id="rosa-hcp-firewall-prerequisites_{context}"]
 = Firewall prerequisites for {hcp-title}
 
-* If you are using a firewall to control egress traffic from {hcp-title-first}, your Virtual Private Cloud (VPC) must be able to complete requests from the cluster to the Amazon S3 service, for example, via an Amazon S3 gateway.
+* If you are using a firewall to control egress traffic from {rosa-title}, your Virtual Private Cloud (VPC) must be able to complete requests from the cluster to the Amazon S3 service, for example, via an Amazon S3 gateway.
 
 * You must also configure your firewall to grant access to the following domain and port combinations.
 //TODO OSDOCS-11789: From your deploy machine? From your cluster?

modules/rosa-sts-aws-requirements-security-req.adoc

@@ -7,4 +7,7 @@
 = Security requirements
 //TODO OSDOCS-11789: Red Hat as in RHSRE? Red Hat as in RH services in the cluster?
 * Red{nbsp}Hat must have ingress access to EC2 hosts and the API server from allow-listed IP addresses.
-* Red{nbsp}Hat must have egress allowed to the domains documented in the "Firewall prerequisites" section. Clusters with {zero-egress} are exempt from this requirement.
+* Red{nbsp}Hat must have egress allowed to the domains documented in the "Firewall prerequisites" section. 
+ifdef::openshift-rosa-hcp[]
+Clusters with {egress-zero} are exempt from this requirement.
+endif::openshift-rosa-hcp[]

modules/rosa-sts-aws-requirements-support-req.adoc

@@ -7,4 +7,11 @@
 * Red{nbsp}Hat recommends that the customer have at least link:https://aws.amazon.com/premiumsupport/plans/[Business Support] from AWS.
 * Red{nbsp}Hat may have permission from the customer to request AWS support on their behalf.
 * Red{nbsp}Hat may have permission from the customer to request AWS resource limit increases on the customer's account.
-* Red{nbsp}Hat manages the restrictions, limitations, expectations, and defaults for all {product-title} clusters in the same manner, unless otherwise specified in this requirements section.
+* Red{nbsp}Hat manages the restrictions, limitations, expectations, and defaults for all 
+ifdef::openshift-rosa[]
+{rosa-classic-short} 
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+{rosa-short} 
+endif::openshift-rosa-hcp[]
+clusters in the same manner, unless otherwise specified in this requirements section.

rosa_planning/rosa-cloud-expert-prereq-checklist.adoc

@@ -3,10 +3,10 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: rosa-cloud-expert-prereq-checklist
 [id="rosa-cloud-expert-prereq-checklist"]
 ifndef::openshift-rosa-hcp[]
-= Prerequisites checklist for deploying ROSA using STS
+= Prerequisites checklist for deploying {rosa-classic-short} using STS
 endif::[]
 ifdef::openshift-rosa-hcp[]
-= Prerequisites checklist for deploying ROSA with HCP
+= Prerequisites checklist for deploying {rosa-short}
 endif::openshift-rosa-hcp[]
 
 toc::[]
@@ -23,13 +23,11 @@ toc::[]
 //  - Diana Sari
 //---
 
-This is a high level checklist of prerequisites needed to create a
+This is a high level checklist of prerequisites needed to create a {product-title} cluster
 ifdef::openshift-rosa[]
-{rosa-classic-first} cluster with link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html[STS].
+ with link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html[STS]
 endif::openshift-rosa[]
-ifdef::openshift-rosa-hcp[]
-{hcp-title-first} cluster.
-endif::openshift-rosa-hcp[]
+.
 
 //TODO OSDOCS-11789: Consider adding the following to a subsection about the initiating/control machine, along with CLI sections?
 The machine that you run the installation process from must have access to the following:
@@ -126,7 +124,14 @@ $ rosa whoami
 
 === OpenShift CLI (`oc`)
 
-The OpenShift CLI (`oc`) is not required to deploy a {product-title} cluster, but is a useful tool for interacting with your cluster after it is deployed.
+The OpenShift CLI (`oc`) is not required to deploy a 
+ifdef::openshift-rosa[]
+{rosa-classic-short} 
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+{rosa-short} 
+endif::openshift-rosa-hcp[]
+cluster, but is a useful tool for interacting with your cluster after it is deployed.
 
 . Download and install`oc` from the {cluster-manager} link:https://console.redhat.com/openshift/downloads#tool-oc[Command-line interface (CLI) tools] page, or follow the instructions in xref:../cli_reference/openshift_cli/getting-started-cli.adoc#cli-getting-started[Getting started with the OpenShift CLI].
 . Verify that the OpenShift CLI has been installed correctly by running the following command:
@@ -148,20 +153,33 @@ $ rosa verify quota
 +
 This command only checks the total quota allocated to your account; it does not reflect the amount of quota already consumed from that quota. Running this command is optional because your quota is verified during cluster deployment. However, Red Hat recommends running this command to confirm your quota ahead of time so that deployment is not interrupted by issues with quota availability.
 ifdef::openshift-rosa[]
-* For more information about resources provisioned during ROSA cluster deployment, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-sts-aws-prereqs[Provisioned AWS Infrastructure].
+* For more information about resources provisioned during {rosa-classic-short} cluster deployment, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-sts-aws-prereqs[Provisioned AWS Infrastructure].
 * For more information about the required AWS service quotas, see xref:../rosa_planning/rosa-sts-required-aws-service-quotas.adoc#rosa-sts-required-aws-service-quotas[Required AWS service quotas].
 endif::openshift-rosa[]
 ifdef::openshift-rosa-hcp[]
-* For more information about resources provisioned during ROSA cluster deployment, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-hcp-prereqs[Provisioned AWS Infrastructure].
+* For more information about resources provisioned during {rosa-short} cluster deployment, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-aws-policy-provisioned_rosa-hcp-prereqs[Provisioned AWS Infrastructure].
 * For more information about the required AWS service quotas, see xref:../rosa_planning/rosa-sts-required-aws-service-quotas.adoc#rosa-sts-required-aws-service-quotas[Required AWS service quotas].
 endif::openshift-rosa-hcp[]
 
 == Service Control Policy (SCP) prerequisites
 
-ROSA clusters are hosted in an AWS account within an AWS organizational unit. A link:https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scps.html[service control policy (SCP)] is created and applied to the AWS organizational unit that manages what services the AWS sub-accounts are permitted to access.
+ifdef::openshift-rosa[]
+{rosa-classic-short} 
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+{rosa-short} 
+endif::openshift-rosa-hcp[]
+clusters are hosted in an AWS account within an AWS organizational unit. A link:https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scps.html[service control policy (SCP)] is created and applied to the AWS organizational unit that manages what services the AWS sub-accounts are permitted to access.
 
 * Ensure that your organization's SCPs are not more restrictive than the roles and policies required by the cluster. For more information, see the xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-minimum-scp_rosa-sts-about-iam-resources[Minimum set of effective permissions for SCPs].
-* When you create a ROSA cluster, an associated AWS OpenID Connect (OIDC) identity provider is created.
+* When you create a 
+ifdef::openshift-rosa[]
+{rosa-classic-short} 
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+{rosa-short} 
+endif::openshift-rosa-hcp[]
+cluster, an associated AWS OpenID Connect (OIDC) identity provider is created.
 
 == Networking prerequisites
 
@@ -182,7 +200,7 @@ endif::openshift-rosa-hcp[]
 
 //Moving up prereqs that are actually required for deployment
 ifdef::openshift-rosa[]
-== VPC requirements for PrivateLink clusters
+=== VPC requirements for PrivateLink clusters
 
 If you choose to deploy a PrivateLink cluster, then be sure to deploy the cluster in the pre-existing BYO VPC:
 
@@ -206,13 +224,13 @@ xref:../networking/configuring-cluster-wide-proxy.adoc#configuring-cluster-wide-
 
 [NOTE]
 ====
-You can install a non-PrivateLink ROSA cluster in a pre-existing BYO VPC.
+You can install a non-PrivateLink {rosa-classic-short} cluster in a pre-existing BYO VPC.
 ====
 endif::openshift-rosa[]
 ifdef::openshift-rosa-hcp[]
 === Create VPC before cluster deployment
 
-{hcp-title} clusters must be deployed into an existing AWS Virtual Private Cloud (VPC).
+{rosa-short} clusters must be deployed into an existing AWS Virtual Private Cloud (VPC).
 
 include::snippets/rosa-existing-vpc-requirements.adoc[leveloffset=+0]
 
@@ -243,7 +261,14 @@ endif::openshift-rosa-hcp[]
 You can configure a custom domain name server and custom domain name for your cluster. To do so, complete the following prerequisites before you create the cluster:
 
 //TODO OSDOCS-11789: Needs verification from mmcneill
-* By default, ROSA clusters require you to set the `domain name servers` option to `AmazonProvidedDNS` to ensure successful cluster creation and operation.
+* By default, 
+ifdef::openshift-rosa[]
+{rosa-classic-short} 
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+{rosa-short} 
+endif::openshift-rosa-hcp[]
+clusters require you to set the `domain name servers` option to `AmazonProvidedDNS` to ensure successful cluster creation and operation.
 * To use a custom DNS server and domain name for your cluster, the ROSA installer must be able to use VPC DNS with default DHCP options so that it can resolve internal IPs and services. This means that you must create a custom DHCP option set to forward DNS lookups to your DNS server, and associate this option set with your VPC before you create the cluster.
 ifdef::openshift-rosa[]
 For more information, see xref:../cloud_experts_tutorials/cloud-experts-custom-dns-resolver.adoc#cloud-experts-custom-dns-resolver[Deploying ROSA with a custom DNS resolver].

rosa_planning/rosa-sts-aws-prereqs.adoc

@@ -4,17 +4,17 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
 ifndef::openshift-rosa-hcp[]
 :context: rosa-sts-aws-prereqs
 [id="rosa-sts-aws-prereqs"]
-= Detailed requirements for deploying ROSA (classic architecture) using STS
+= Detailed requirements for deploying {product-title} using STS
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
 :context: rosa-hcp-prereqs
 [id="rosa-hcp-prereqs"]
-= Detailed requirements for deploying {hcp-title}
+= Detailed requirements for deploying {product-title}
 endif::openshift-rosa-hcp[]
 
 toc::[]
 
-{product-title} (ROSA) provides a model that allows Red{nbsp}Hat to deploy clusters into a customer’s existing Amazon Web Service (AWS) account.
+{product-title} provides a model that allows Red{nbsp}Hat to deploy clusters into a customer’s existing Amazon Web Service (AWS) account.
 
 ifndef::openshift-rosa-hcp[]
 include::snippets/rosa-sts.adoc[leveloffset=+0]
@@ -26,13 +26,13 @@ ifndef::openshift-rosa-hcp[]
 [id="rosa-sts-customer-requirements_{context}"]
 == Customer requirements when using STS for deployment
 
-The following prerequisites must be complete before you deploy a {product-title} (ROSA) cluster that uses the AWS Security Token Service (STS).
+The following prerequisites must be complete before you deploy a {rosa-classic-short} cluster that uses the AWS Security Token Service (STS).
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
 [id="rosa-hcp-customer-requirements_{context}"]
-== Customer requirements for all {hcp-title} clusters
+== Customer requirements for all {rosa-short} clusters
 
-The following prerequisites must be complete before you deploy a {hcp-title} cluster.
+The following prerequisites must be complete before you deploy a {rosa-short} cluster.
 endif::openshift-rosa-hcp[]
 
 include::modules/rosa-sts-aws-requirements-account.adoc[leveloffset=+2]
@@ -81,7 +81,7 @@ ifdef::openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 [id="additional-resources_creating-association_{context}"]
 == Additional resources
-* See xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-account-wide-roles-and-policies_rosa-sts-about-iam-resources[Account-wide IAM role and policy reference] for a list of IAM roles needed for cluster creation.
+* xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-account-wide-roles-and-policies_rosa-sts-about-iam-resources[Account-wide IAM role and policy reference]
 endif::openshift-rosa,openshift-rosa-hcp[]
 
 include::modules/rosa-sts-aws-requirements-creating-multi-association.adoc[leveloffset=+2]