OSDOCS-14094: Applied changes to Preparing your Environment

Author: EricPonvelle

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

@@ -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:

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]