Merge pull request #59383 from EricPonvelle/ROSA-HCP_Renaming

EricPonvelle · web-flow · commit 0799efed2b69 · 2023-05-01T15:29:19.000-04:00
ROSA-HCP: Renamed the product to ROSA with hosted control planes.
diff --git a/_attributes/attributes-openshift-dedicated.adoc b/_attributes/attributes-openshift-dedicated.adoc
@@ -29,4 +29,5 @@
 :openshift-local-productname: Red Hat OpenShift Local
 :openshift-dev-spaces-productname: Red Hat OpenShift Dev Spaces
 :hcp: hosted control planes
-:hcp-first: Hosted control planes
+:hcp-title: ROSA with {hcp}
+:hcp-title-first: {product-title} (ROSA) with {hcp}
diff --git a/modules/rosa-hcp-byo-oidc-options.adoc b/modules/rosa-hcp-byo-oidc-options.adoc
@@ -20,7 +20,7 @@ You are required to register the unmanaged OIDC configuration by posting a reque
 
 Allows you to provide raw files for the private RSA key. This key is named `rosa-private-key-oidc-<random_label_of_length_4>.key`. You also receive a discovery document, named `discovery-document-oidc-<random_label_of_length_4>.json`, and a JSON Web Key Set, named `jwks-oidc-<random_label_of_length_4>.json`.
 
-You use these files to set up the endpoint. This endpoint responds to `/.well-known/openid-configuration` with the discovery document and on `keys.json` with the JSON Web Key Set. The private key is to be stored in Amazon Web Services (AWS) Secrets Manager Service (SMS) as plaintext.
+You use these files to set up the endpoint. This endpoint responds to `/.well-known/openid-configuration` with the discovery document and on `keys.json` with the JSON Web Key Set. The private key is stored in Amazon Web Services (AWS) Secrets Manager Service (SMS) as plaintext.
 
 .Example
 [source,terminal]
@@ -34,7 +34,7 @@ $ rosa create oidc-config --raw-files
 
 Allows you to specify the mode to create your OIDC configuration. With the `manual` option, you receive AWS commands that setup the OIDC configuration within an S3 bucket. This option stores the private key in the Secrets Manager. With the `manual` option, the OIDC Endpoint URL is the URL for the S3 bucket. You must retrieve the Secrets Manager ARN to register the OIDC configuration with OCM.
 
-Using the `auto` option, like with manual mode, you receive the same OIDC configuration with AWS resources. One change is that ROSA calls AWS, so you do not need to do anything else. The OIDC Endpoint URL is the URL for the S3 bucket. The CLI retrieves the Secrets Manager ARN, registers the OIDC configuration with OCM, and reports a second ROSA command the user can run to continue with creation of STS cluster.
+Using the `auto` option, you receive the same OIDC configuration and AWS resources as the `manual` mode. One change is that ROSA calls AWS, so you do not need to do anything else. The OIDC Endpoint URL is the URL for the S3 bucket. The CLI retrieves the Secrets Manager ARN, registers the OIDC configuration with OCM, and reports a second ROSA command that the user can run to continue with creation of STS cluster.
 
 .Example
 [source,terminal]
diff --git a/modules/rosa-hcp-byo-oidc.adoc b/modules/rosa-hcp-byo-oidc.adoc
@@ -8,7 +8,7 @@
 
 You can create your own OpenID Connect (OIDC) configuration before you create your cluster by using the `rosa create oidc-config --mode=auto` command. This command produces an OIDC configuration that is hosted under Red Hat's AWS account. The `rosa` CLI provides some additional options for creating your OIDC configuration.
 
-You can generate managed or unmanaged OIDC configurations. Customer-hosted, or unmanaged, OIDC configurations are stored within your AWS account with the configurations also being flagged for use with {cluster-manager-first}. This process also provides you with a private key to have access to and take ownership of the configurations. Red-Hat hosted, or managed, OIDC configurations are stored within Red Hat's AWS account. This process provides you with private keys for accessing the configuration. 
+You can generate managed or unmanaged OIDC configurations. Customer-hosted, or unmanaged, OIDC configurations are stored within your AWS account, and the configurations are flagged for use with {cluster-manager-first}. This process also provides you with a private key to have access to and take ownership of the configurations. Red Hat-hosted, or managed, OIDC configurations are stored within Red Hat's AWS account. This process provides you with private keys for accessing the configuration. 
 
 [NOTE]
 ====
@@ -17,7 +17,7 @@ When using the `--managed` parameter, you can only create a new managed OIDC con
 
 .Prerequisites
 
-* You have completed the AWS prerequisites for {hcp} for ROSA.
+* You have completed the AWS prerequisites for {hcp-title}.
 * You have installed and configured the latest ROSA CLI (`rosa`) on your installation host.
 
 .Procedure
diff --git a/modules/rosa-hcp-classic-comparison.adoc b/modules/rosa-hcp-classic-comparison.adoc
@@ -4,11 +4,11 @@
 
 :_content-type: CONCEPT
 [id="rosa-hcp-classic-comparison_{context}"]
-= Comparing ROSA Classic and hosted control planes for ROSA
+= Comparing ROSA with hosted control planes and ROSA Classic
 
-{hcp-first} for {product-title} (ROSA) offers a different way to create a managed ROSA cluster. {hcp-first} for ROSA offers a reduced-cost solution with focuses on reliability and efficiency. With a focus on efficiency, you can quickly create a new cluster and deploy applications in minutes. 
+{hcp-title-first} offers a different way to create a managed ROSA cluster. {hcp-title} offers a reduced-cost solution with focuses on reliability and efficiency. With a focus on efficiency, you can quickly create a new cluster and deploy applications in minutes. 
 
-{hcp-first} for ROSA requires only a minimum two nodes, making it ideal for smaller projects, while still being able to scale to support larger projects and enterprises.
+{hcp-title} requires only a minimum of two nodes making it ideal for smaller projects while still being able to scale to support larger projects and enterprises.
 
 .ROSA architectures comparison table
 
@@ -34,8 +34,8 @@
     * All-in-one {product-title} infrastructure architecture
     
 | *Footprint*
-| 1 cluster requires a minimum of 2 nodes
-| 1 cluster requires minimum of 7 nodes
+| One cluster requires a minimum of two nodes
+| One cluster requires a minimum of seven nodes
 
 | *Deployment* 
 | 
diff --git a/modules/rosa-hcp-creating-account-wide-sts-roles-and-policies.adoc b/modules/rosa-hcp-creating-account-wide-sts-roles-and-policies.adoc
@@ -6,18 +6,18 @@
 [id="rosa-sts-creating-account-wide-sts-roles-and-policies_{context}"]
 = Creating the account-wide STS roles and policies
 
-Before using the {cluster-manager-first} {hybrid-console-second} to create {hcp} for {product-title} (ROSA) clusters, create the required account-wide roles and policies, including the Operator policies.
+Before using the {cluster-manager-first} {hybrid-console-second} to create {hcp-title-first} clusters, create the required account-wide roles and policies, including the Operator policies.
 
 .Prerequisites
 
-* You have completed the AWS prerequisites for {hcp} for ROSA with STS.
+* You have completed the AWS prerequisites for {hcp-title}.
 * You have available AWS service quotas.
 * You have enabled the ROSA service in the AWS Console.
 * You have installed and configured the latest ROSA CLI (`rosa`) on your installation host.
 +
 [NOTE]
 ====
-To successfully install {hcp} for ROSA clusters, use the latest version of the ROSA CLI (`rosa`).
+To successfully install {hcp-title} clusters, use the latest version of the ROSA CLI (`rosa`).
 ====
 * You have logged in to your Red Hat account by using the `rosa` CLI.
 
diff --git a/modules/rosa-hcp-sts-creating-a-cluster-cli.adoc b/modules/rosa-hcp-sts-creating-a-cluster-cli.adoc
@@ -4,13 +4,13 @@
 
 :_content-type: PROCEDURE
 [id="rosa-hcp-sts-creating-a-cluster-cli_{context}"]
-= Creating a {hcp} for ROSA cluster using the CLI
+= Creating a {hcp-title} cluster using the CLI
 
 When using {product-title} (ROSA) CLI (`rosa`) to create a cluster, you can select the default options to create the cluster quickly.
 
 .Prerequisites
 
-* You have completed the AWS prerequisites for {hcp} for ROSA.
+* You have completed the AWS prerequisites for {hcp-title}.
 * You have available AWS service quotas.
 * You have enabled the ROSA service in the AWS Console.
 * You have installed and configured the latest ROSA CLI (`rosa`) on your installation host.
@@ -32,7 +32,7 @@ To successfully install ROSA clusters, use the latest version of the ROSA CLI (`
 //REGION="<region>"
 //----
 
-. You can create your {hcp} for ROSA cluster with one of the following commands. 
+. You can create your {hcp-title} cluster with one of the following commands. 
 +
 [NOTE]
 ====
diff --git a/modules/rosa-hcp-vpc-manual.adoc b/modules/rosa-hcp-vpc-manual.adoc
@@ -19,8 +19,8 @@ To manually create your Virtual Private Cloud (VPC), go to link:https://us-east-
 | CIDR range
 | Your VPC CIDR range should match your machine CIDR.
 
-| Availability Zone
-| You need 1 Availability Zone for a single zone, and you need 3 for Availability Zones for multi-zone.
+| Availability zone
+| You need one availability zone for a single zone, and you need three for availability zones for multi-zone.
 
 | Public subnet 
 | You must have one public subnet with a NAT gateway.
diff --git a/modules/rosa-hcp-vpc-terraform.adoc b/modules/rosa-hcp-vpc-terraform.adoc
@@ -6,7 +6,7 @@
 [id="rosa-hcp-vpc-terraform_{context}"]
 = Creating an AWS Virtual Private Cloud using Terraform
 
-Terraform is a tool that allows you to create various resources using an established template. The following process uses the default options as required to create a {hcp} for ROSA cluster. For more information about using Terraform, see the additional resources.
+Terraform is a tool that allows you to create various resources using an established template. The following process uses the default options as required to create a {hcp-title} cluster. For more information about using Terraform, see the additional resources.
 
 .Prerequisites
 
@@ -58,7 +58,7 @@ $ terraform plan -out rosa.plan [-var aws_region=<region>] [-var cluster_name=<c
 $ terraform apply rosa.plan
 ----
 
-. Optional: You can capture the values of the Terraform-provisioned private, public, and machinepool subnet IDs as environment variables to use when creating your {hcp} for ROSA cluster by running the following commands:
+. Optional: You can capture the values of the Terraform-provisioned private, public, and machinepool subnet IDs as environment variables to use when creating your {hcp-title} cluster by running the following commands:
 +
 ** For the private subnet ID:
 +
diff --git a/modules/rosa-sts-associating-your-aws-account.adoc b/modules/rosa-sts-associating-your-aws-account.adoc
@@ -22,18 +22,22 @@ endif::[]
 
 Before using the {cluster-manager-first} {hybrid-console-second} to create 
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} clusters 
 endif::rosa-hcp[]
-{product-title} (ROSA) clusters that use the AWS Security Token Service (STS), create an {cluster-manager} IAM role and link it to your Red Hat organization. Then, create a user IAM role and link it to your Red Hat user account in the same Red Hat organization.
+ifndef::rosa-hcp[]
+{product-title} (ROSA) clusters 
+endif::rosa-hcp[]
+that use the AWS Security Token Service (STS), create an {cluster-manager} IAM role and link it to your Red Hat organization. Then, create a user IAM role and link it to your Red Hat user account in the same Red Hat organization.
 
 ifdef::quick-install[]
 .Prerequisites
 
-* You have completed the AWS prerequisites for  
 ifdef::rosa-hcp[]
-{hcp} for 
+* You have completed the AWS prerequisites for {hcp-title}.
+endif::rosa-hcp[]
+ifndef::rosa-hcp[]
+* You have completed the AWS prerequisites for ROSA with STS. 
 endif::rosa-hcp[]
-ROSA with STS.
 * You have available AWS service quotas.
 * You have enabled the ROSA service in the AWS Console.
 * You have installed and configured the latest ROSA CLI (`rosa`) on your installation host.
@@ -42,9 +46,12 @@ ROSA with STS.
 ====
 To successfully install  
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} 
+endif::rosa-hcp[]
+ifndef::rosa-hcp[]
+ROSA 
 endif::rosa-hcp[]
-ROSA clusters, use the latest version of the ROSA CLI.
+clusters, use the latest version of the ROSA CLI.
 ====
 * You have logged in to your Red Hat account by using the `rosa` CLI.
 * You have organization administrator privileges in your Red Hat organization.
@@ -58,22 +65,31 @@ endif::[]
 ====
 To enable automatic deployment of the cluster-specific Operator roles and the OpenID Connect (OIDC) provider using the {cluster-manager} {hybrid-console-second}, you must apply the administrative privileges to the role by choosing the _Admin OCM role_ command in the *Accounts and roles* step of creating a 
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} 
 endif::rosa-hcp[]
-ROSA cluster. For more information about the basic and administrative privileges for the {cluster-manager} role, see _Understanding AWS account association_.
+ifndef::rosa-hcp[]
+ROSA 
+endif::rosa-hcp[]
+cluster. For more information about the basic and administrative privileges for the {cluster-manager} role, see _Understanding AWS account association_.
 ====
 +
 [NOTE]
 ====
 If you choose the _Basic OCM role_ command in the *Accounts and roles* step of creating a 
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} 
+endif::rosa-hcp[]
+ifndef::rosa-hcp[]
+ROSA 
 endif::rosa-hcp[]
-ROSA cluster in the {cluster-manager} {hybrid-console-second}, you must deploy a 
+cluster in the {cluster-manager} {hybrid-console-second}, you must deploy a 
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} 
+endif::rosa-hcp[]
+ifndef::rosa-hcp[]
+ROSA 
 endif::rosa-hcp[]
-ROSA cluster using manual mode. You will be prompted to configure the cluster-specific Operator roles and the OpenID Connect (OIDC) provider in a later step.
+cluster using manual mode. You will be prompted to configure the cluster-specific Operator roles and the OpenID Connect (OIDC) provider in a later step.
 ====
 +
 [source,terminal]
diff --git a/modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc b/modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc
@@ -17,12 +17,15 @@ endif::[]
 
 You can quickly create a 
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} 
 endif::rosa-hcp[]
-{product-title} (ROSA) cluster with the AWS Security Token Service (STS) by using the default installation options. The following summary describes the default cluster specifications.
+ifndef::rosa-hcp[]
+{product-title} (ROSA) 
+endif::rosa-hcp[]
+cluster with the AWS Security Token Service (STS) by using the default installation options. The following summary describes the default cluster specifications.
 
 ifdef::rosa-hcp[]
-.Default {hcp} for ROSA cluster specifications
+.Default {hcp-title} cluster specifications
 endif::rosa-hcp[]
 ifdef::rosa-standalone[]
 .Default ROSA with STS cluster specifications
diff --git a/modules/rosa-sts-understanding-aws-account-association.adoc b/modules/rosa-sts-understanding-aws-account-association.adoc
@@ -26,9 +26,12 @@ endif::[]
 
 Before you can use the {cluster-manager-first} {hybrid-console-second} to create 
 ifdef::rosa-hcp[]
-{hcp} for 
+{hcp-title} 
 endif::rosa-hcp[]
-{product-title} (ROSA) clusters that use the AWS Security Token Service (STS), you must associate your AWS account with your Red Hat organization. You can associate your account by creating and linking the following IAM roles.
+ifndef::rosa-hcp[]
+{product-title} (ROSA) 
+endif::rosa-hcp[]
+clusters that use the AWS Security Token Service (STS), you must associate your AWS account with your Red Hat organization. You can associate your account by creating and linking the following IAM roles.
 
 {cluster-manager} role:: Create an {cluster-manager} IAM role and link it to your Red Hat organization.
 +
diff --git a/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc b/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc
@@ -11,25 +11,25 @@ toc::[]
 If you are looking for a quickstart guide for ROSA, see xref:../rosa_getting_started/rosa-quickstart-guide-ui.adoc#rosa-quickstart-guide-ui[{product-title} quickstart guide].
 ====
 
-{hcp-first} for {product-title} (ROSA) offers a more efficient and reliable architecture for creating ROSA clusters. With {hcp} for ROSA, each cluster has a dedicated control plane that is isolated in a Red Hat account. 
+{hcp-title-first} offers a more efficient and reliable architecture for creating ROSA clusters. With {hcp-title}, each cluster has a dedicated control plane that is isolated in a Red Hat account. 
 
 [IMPORTANT]
 ====
-Since it is not possible to "upgrade" to a {hcp} architecture, you must create a new cluster to benefit from the {hcp} for {product-title} functionality.
+Since it is not possible to "upgrade" to a {hcp} architecture, you must create a new cluster to benefit from the for {hcp-title} functionality.
 ====
 
-Create {hcp} for a {product-title} (ROSA) cluster quickly by using the default options and automatic AWS Identity and Access Management (IAM) resource creation. You can deploy your cluster by using the ROSA CLI (`rosa`).
+Create {hcp-title} cluster quickly by using the default options and automatic AWS Identity and Access Management (IAM) resource creation. You can deploy your cluster by using the ROSA CLI (`rosa`).
 
 [NOTE]
 ====
-All {hcp} for ROSA clusters require AWS Security Token Service (STS) to be enabled.
+All {hcp-title} clusters require AWS Security Token Service (STS) to be enabled.
 ====
 
 include::modules/rosa-hcp-classic-comparison.adoc[leveloffset=+2]
 
 The procedures in this document use the `auto` mode in the ROSA CLI (`rosa`) to immediately create the required IAM resources using the current AWS account. The required resources include the account-wide IAM roles and policies, cluster-specific Operator roles and policies, and OpenID Connect (OIDC) identity provider.
 
-Alternatively, you can use `manual` mode, which outputs the `aws` commands needed to create the IAM resources instead of deploying them automatically. For steps to deploy a {hcp} for ROSA cluster by using `manual` mode or with customizations, see xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-with-customizations.adoc#rosa-sts-creating-cluster-using-customizations_rosa-sts-creating-a-cluster-with-customizations[Creating a cluster using customizations].
+Alternatively, you can use `manual` mode, which outputs the `aws` commands needed to create the IAM resources instead of deploying them automatically. For steps to deploy a {hcp-title} cluster by using `manual` mode or with customizations, see xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-with-customizations.adoc#rosa-sts-creating-cluster-using-customizations_rosa-sts-creating-a-cluster-with-customizations[Creating a cluster using customizations].
 
 [id="next-steps-hcp_{context}"]
 .Next steps
@@ -49,9 +49,9 @@ include::modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc[le
 //include::modules/rosa-sts-associating-your-aws-account.adoc[leveloffset=+2]
 include::modules/rosa-hcp-creating-account-wide-sts-roles-and-policies.adoc[leveloffset=+1]
 [id="rosa-hcp-creating-vpc"]
-= Creating a Virtual Private Cloud for your ROSA {hcp} clusters
+== Creating a Virtual Private Cloud for your {hcp-title} clusters
 
-You must have a Virtual Private Cloud (VPC) to create {hcp} for ROSA cluster. You can manually create these using the AWS console, or you can use `terraform` to create a VPC by using a template.
+You must have a Virtual Private Cloud (VPC) to create {hcp-title} cluster. You can manually create this VPC using the AWS console, or you can use `terraform` to create a VPC by using a template.
 
 include::modules/rosa-hcp-vpc-terraform.adoc[leveloffset=+2]
 
@@ -67,7 +67,7 @@ include::modules/rosa-hcp-vpc-manual.adoc[leveloffset=+2]
 [id="rosa-hcp-byo-odic-overview_{context}"]
 == Creating an OpenID Connect Configuration
 
-When using a Red Hat-hosted cluster, you can create a managed or unmanaged OpenID Connect (OIDC) configuration that is generated by the CLI. With a managed OIDC configuration, it is stored within Red Hat's AWS account. A generated unmanaged OIDC configuration is stored in your AWS account. The configuration is registered to be used with OCM. This generated unmanaged OIDC configuration provides the private key for you to access. This process does not provide a private key for users to access.
+When using a Red Hat-hosted cluster, you can create a managed or unmanaged OpenID Connect (OIDC) configuration that is generated by the CLI. A managed OIDC configuration is stored within Red Hat's AWS account. A generated unmanaged OIDC configuration is stored in your AWS account. The configuration is registered to be used with OCM. This generated unmanaged OIDC configuration provides the private key for you to access. This process does not provide a private key for users to access.
 
 [discrete]
 include::modules/rosa-hcp-byo-oidc.adoc[leveloffset=+2]
diff --git a/snippets/rosa-hcp-rn.adoc b/snippets/rosa-hcp-rn.adoc

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`[id="rosa-hcp-vpc-terraform_{context}"]`
`7`	`7`	`= Creating an AWS Virtual Private Cloud using Terraform`
`8`	`8`
`9`		`-Terraform is a tool that allows you to create various resources using an established template. The following process uses the default options as required to create a {hcp} for ROSA cluster. For more information about using Terraform, see the additional resources.`
	`9`	`+Terraform is a tool that allows you to create various resources using an established template. The following process uses the default options as required to create a {hcp-title} cluster. For more information about using Terraform, see the additional resources.`
`10`	`10`
`11`	`11`	`.Prerequisites`
`12`	`12`
`@@ -58,7 +58,7 @@ $ terraform plan -out rosa.plan [-var aws_region=<region>] [-var cluster_name=<c`
`58`	`58`	`$ terraform apply rosa.plan`
`59`	`59`	`----`
`60`	`60`
`61`		`-. Optional: You can capture the values of the Terraform-provisioned private, public, and machinepool subnet IDs as environment variables to use when creating your {hcp} for ROSA cluster by running the following commands:`
	`61`	`+. Optional: You can capture the values of the Terraform-provisioned private, public, and machinepool subnet IDs as environment variables to use when creating your {hcp-title} cluster by running the following commands:`
`62`	`62`	`+`
`63`	`63`	`** For the private subnet ID:`
`64`	`64`	`+`