OSDOCS-14434: Changed the ROSA name variables.

Author: EricPonvelle

_attributes/attributes-openshift-dedicated.adoc

@@ -27,6 +27,15 @@
 :sts-first: Security Token Service (STS)
 :sts-full: Security Token Service
 :sts-short: STS
+// ROSA specific
+:hcp: hosted control planes
+:rosa-first: Red Hat OpenShift Service on AWS (ROSA) with {hcp} (HCP)
+:rosa-short: ROSA with HCP
+:rosa-classic-first: {product-title} (ROSA) (classic architecture)
+:rosa-classic: Red Hat OpenShift Service on AWS (classic architecture)
+:rosa-classic-short: ROSA (classic)
+:classic: {rosa-classic}
+:classic-short: {rosa-classic-short}
 //logging
 :logging-title: logging for Red Hat OpenShift
 :logging-title-uc: Logging for Red Hat OpenShift
@@ -49,11 +58,6 @@
 //Formerly known as CodeReady Containers and CodeReady Workspaces
 :openshift-local-productname: Red Hat OpenShift Local
 :openshift-dev-spaces-productname: Red Hat OpenShift Dev Spaces
-:hcp: hosted control planes
-:hcp-title: ROSA with HCP
-:hcp-title-first: {product-title} (ROSA) with {hcp} (HCP)
-:rosa-classic: ROSA (classic architecture)
-:rosa-classic-first: {product-title} (ROSA) (classic architecture)
 :egress-lockdown: {hcp-title} clusters with zero egress
 //ROSA CLI variables
 :zero-egress: zero egress

_distro_map.yml

@@ -196,7 +196,7 @@ openshift-aro:
       name: '4'
       dir: aro/4
 openshift-rosa:
-  name: Red Hat OpenShift Service on AWS
+  name: Red Hat OpenShift Service on AWS (classic architecture)
   author: OpenShift Documentation Project <[email protected]>
   site: commercial
   site_name: Documentation

_topic_maps/_topic_map_rosa.yml

@@ -29,7 +29,7 @@ Topics:
 - Name: Welcome
   File: index
 - Name: Learn more about ROSA with HCP
-  File: about-hcp
+  File: rosa-classic-about
 - Name: AWS STS and ROSA with HCP explained
   File: cloud-experts-rosa-hcp-sts-explained
 - Name: Legal notice

_topic_maps/_topic_map_rosa_hcp.yml

@@ -21,6 +21,20 @@
 # The ordering of the records in this document determines the ordering of the
 # topic groups and topics on the main page.
 ---
+Name: About
+Dir: welcome
+Distros: openshift-rosa-hcp
+Topics:
+- Name: Welcome
+  File: index
+- Name: Learn more about ROSA with HCP
+  File: rosa-hcp-about
+- Name: AWS STS and ROSA with HCP explained
+  File: cloud-experts-rosa-hcp-sts-explained
+- Name: Legal notice
+  File: legal-notice
+  Distros: openshift-rosa-hcp
+---
 Name: What's new
 Dir: rosa_release_notes
 Distros: openshift-rosa-hcp
@@ -32,14 +46,6 @@ Name: Introduction to ROSA
 Dir: rosa_architecture
 Distros: openshift-rosa-hcp
 Topics:
-- Name: Welcome
-  File: index
-- Name: Legal notice
-  File: legal-notice
-- Name: ROSA with HCP overview
-  File: about-hcp
-- Name: AWS STS and ROSA with HCP explained
-  File: cloud-experts-rosa-hcp-sts-explained
 - Name: Architecture models
   File: rosa-architecture-models
 - Name: Policies and service definition

cli_reference/rosa_cli/rosa-updating-billing-account-cli.adoc

@@ -1,7 +1,7 @@
 :_mod-docs-content-type: ASSEMBLY
 include::_attributes/attributes-openshift-dedicated.adoc[]
 [id="rosa-updating-account-cli"]
-= Managing billing accounts for ROSA with HCP clusters
+= Managing billing accounts for {rosa-short} clusters
 :context: rosa-updating-account-cli
 toc::[]
 

cloud_experts_tutorials/cloud-experts-aws-secret-manager.adoc

@@ -63,7 +63,7 @@ ifndef::openshift-rosa-hcp[]
 See xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc#rosa-sts-creating-a-cluster-quickly[Red{nbsp}Hat documentation on creating an STS cluster] before continuing this process.
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa-hcp[]
-See link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[Creating ROSA with HCP clusters using the default options] before continuing this process.
+See link:https://docs.openshift.com/rosa-hcp/rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.html[Creating {rosa-short} clusters using the default options] before continuing this process.
 endif::openshift-rosa-hcp[]
 
 . Set the `SecurityContextConstraints` permission to allow the CSI driver to run by running the following command:

cloud_experts_tutorials/cloud-experts-deploying-application/cloud-experts-deploying-application-prerequisites.adoc

@@ -14,7 +14,7 @@ toc::[]
 . A Provisioned ROSA cluster
 +
 ifdef::openshift-rosa-hcp[]
-This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_hcp/rosa-hcp-quickstart-guide.adoc#rosa-getting-started-environment-setup_rosa-hcp-quickstart-guide[ROSA with HCP quick start guide] for more information.
+This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_hcp/rosa-hcp-quickstart-guide.adoc#rosa-getting-started-environment-setup_rosa-hcp-quickstart-guide[{rosa-short} quick start guide] for more information.
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa[]
 This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_getting_started/rosa-quickstart-guide-ui.adoc#rosa-getting-started-environment-setup_rosa-quickstart-guide-ui[ROSA quick start guide] for more information.

cloud_experts_tutorials/cloud-experts-external-dns.adoc

@@ -32,7 +32,7 @@ The `External DNS` Operator does not support STS using IAM Roles for Service Acc
 +
 [NOTE]
 ====
-ROSA with HCP is not supported at this time.
+{rosa-short} is not supported at this time.
 ====
 +
 * A user account with `cluster-admin` privileges

cloud_experts_tutorials/cloud-experts-getting-started/cloud-experts-rosa-sts-explained.adoc

@@ -13,7 +13,7 @@ This tutorial outlines the two options for allowing {product-title} (ROSA) to in
 
 [NOTE]
 ====
-This content currently covers ROSA Classic with AWS STS. For ROSA with hosted control planes (HCP) with AWS STS, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and ROSA with HCP explained].
+This content currently covers ROSA Classic with AWS STS. For ROSA with hosted control planes (HCP) with AWS STS, see xref:../../welcome/cloud-experts-rosa-hcp-sts-explained.adoc#cloud-experts-rosa-hcp-sts-explained[AWS STS and {rosa-short} explained].
 ====
 
 This tutorial will:

cloud_experts_tutorials/cloud-experts-rosa-with-hcp-private-offer-acceptance-and-sharing.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id=“cloud-experts-rosa-with-hcp-private-offer-acceptance-and-sharing”]
-= Tutorial: ROSA with HCP private offer acceptance and sharing
+= Tutorial: {rosa-short} private offer acceptance and sharing
 include::_attributes/attributes-openshift-dedicated.adoc[]
 :context: cloud-experts-rosa-with-hcp-private-offer-acceptance-and-sharing
 
@@ -151,7 +151,7 @@ image::rosa-infrastructure-and-billing-aws-account-selection-during-rosa-with-hc
 * John makes sure that Anne Red{nbsp}Hat user is in the same Red{nbsp}Hat organization as John’s Red{nbsp}Hat user. John is the Red{nbsp}Hat organization administrator and can do that here.
 * Anne visits the {hybrid-console} and starts a new cluster deployment.
 * During the initial steps, Anne makes sure to select 111111111111 as the AWS billing account, while using their own AWS account 123412341234 as the AWS infrastructure account.
-* Note that Anne is also able to select their own AWS account 123412341234 as the billing account when creating a cluster because they previously activated the ROSA with HCP public offer. However, that would result in custom private offer pricing not being applied to this cluster. Therefore it is important for John to communicate the information about which AWS billing account is to be used by employees when creating a new cluster in order to benefit from a private offer that was accepted before.
+* Note that Anne is also able to select their own AWS account 123412341234 as the billing account when creating a cluster because they previously activated the {rosa-short} public offer. However, that would result in custom private offer pricing not being applied to this cluster. Therefore it is important for John to communicate the information about which AWS billing account is to be used by employees when creating a new cluster in order to benefit from a private offer that was accepted before.
 ////
 
 == Troubleshooting
@@ -190,7 +190,7 @@ image::rosa-aws-account-is-already-linked-to-a-different-red-hat-account.png[]
 
 ** However, since this guide pertains to private offers, the assumption is that you are logged in with the AWS account that was specified as the buyer and already accepted the private offer so it is intended to be used as the billing account. Logging in as another AWS account is not expected after a private offer was accepted.
 
-* You can still log in with another Red{nbsp}Hat user which is already connected to the AWS account that accepted the private offer. Other Red{nbsp}Hat users belonging to the same Red{nbsp}Hat organization are able to use the linked AWS account as the ROSA with HCP AWS billing account when creating clusters as seen in Figure 10.
+* You can still log in with another Red{nbsp}Hat user which is already connected to the AWS account that accepted the private offer. Other Red{nbsp}Hat users belonging to the same Red{nbsp}Hat organization are able to use the linked AWS account as the {rosa-short} AWS billing account when creating clusters as seen in Figure 10.
 
 * If you believe that the existing account linking might not be correct, see the "My team members belong to different Red{nbsp}Hat organizations" question below for tips on how you can proceed.
 

cloud_experts_tutorials/cloud-experts-update-component-routes.adoc

@@ -22,7 +22,7 @@ The changes that we make to the component routes{fn-term-component-routes} in th
 +
 [NOTE]
 ====
-ROSA with HCP is not supported at this time.
+{rosa-short} is not supported at this time.
 ====
 +
 * OpenShift CLI (`oc`)

modules/rosa-architecture-local-zones.adoc

@@ -3,16 +3,16 @@
 // * architecture/rosa-architecture-models.adoc
 :_mod-docs-content-type: REFERENCE
 [id="rosa-architecture-local-zones_{context}"]
-= ROSA architecture with Local Zones
+= {rosa-classic-short} architecture with Local Zones
 
-ROSA supports the use of AWS Local Zones, which are metropolis-centralized availability zones where customers can place latency-sensitive application workloads within a VPC. Local Zones are extensions of AWS Regions and are not enabled by default. When Local Zones are enabled and configured, the traffic is extended into the Local Zones for greater flexibility and lower latency. For more information, see "Configuring machine pools in Local Zones".
+{rosa-classic-short} supports the use of AWS Local Zones, which are metropolis-centralized availability zones where customers can place latency-sensitive application workloads within a VPC. Local Zones are extensions of AWS Regions and are not enabled by default. When Local Zones are enabled and configured, the traffic is extended into the Local Zones for greater flexibility and lower latency. For more information, see "Configuring machine pools in Local Zones".
 
 The following diagram displays a ROSA cluster without traffic routed into a Local Zone.
 
-.ROSA cluster without traffic routed into Local Zones
-image::../images/354_OpenShift_ROSA_Local_Zones_0923_1.png[ROSA cluster without traffic routed into Local Zones]
+.{rosa-classic-short} cluster without traffic routed into Local Zones
+image::../images/354_OpenShift_ROSA_Local_Zones_0923_1.png[{rosa-classic-short} cluster without traffic routed into Local Zones]
 
-The following diagram displays a ROSA cluster with traffic routed into a Local Zone.
+The following diagram displays a {rosa-classic-short} cluster with traffic routed into a Local Zone.
 
-.ROSA cluster with traffic routed into Local Zones
-image::../images/354_OpenShift_ROSA_Local_Zones_0923_2.png[ROSA cluster with traffic routed into Local Zones]
+.{rosa-classic-short} cluster with traffic routed into Local Zones
+image::../images/354_OpenShift_ROSA_Local_Zones_0923_2.png[{rosa-classic-short} cluster with traffic routed into Local Zones]

modules/rosa-architecture.adoc

@@ -3,31 +3,31 @@
 // * rosa_architecture/rosa_architecture_sub/rosa-architecture-models.adoc
 
 [id="rosa-classic-architecture_{context}"]
-= ROSA Classic architecture
+= {rosa-classic-short} architecture
 
-In {product-rosa} (ROSA) Classic, both the control plane and the worker nodes are deployed in your VPC subnets.
+In {rosa-classic-first}, both the control plane and the worker nodes are deployed in your VPC subnets.
 
 [id="rosa-classic-architecture-networks_{context}"]
-== ROSA Classic architecture on public and private networks
+== {rosa-classic-short} architecture on public and private networks
 
-With ROSA Classic, you can create clusters that are accessible over public or private networks.
+With {rosa-classic-short}, you can create clusters that are accessible over public or private networks.
 
 You can customize access patterns for your API server endpoint and Red{nbsp}Hat SRE management in the following ways:
 
 * Public - API server endpoint and application routes are internet-facing.
 
-* Private - API server endpoint and application routes are private. Private ROSA Classic clusters use some public subnets, but no control plane or worker nodes are deployed in public subnets.
+* Private - API server endpoint and application routes are private. Private {rosa-classic-short} clusters use some public subnets, but no control plane or worker nodes are deployed in public subnets.
 
 * Private with AWS PrivateLink - API server endpoint and application routes are private. Public subnets or NAT gateways are not required in your VPC for egress. ROSA SRE management uses AWS PrivateLink.
 
-The following image depicts the architecture of a ROSA Classic cluster deployed on both public and private networks.
+The following image depicts the architecture of a {rosa-classic-short} cluster deployed on both public and private networks.
 
-.ROSA Classic deployed on public and private networks
-image::156_OpenShift_ROSA_Arch_0621_private_public_classic.png[ROSA deployed on public and private networks]
+.{rosa-classic-short} deployed on public and private networks
+image::156_OpenShift_ROSA_Arch_0621_private_public_classic.png[{rosa-classic-short} deployed on public and private networks]
 
-ROSA Classic clusters include infrastructure nodes where OpenShift components such as the ingress controller, image registry, and monitoring are deployed. The infrastructure nodes and the OpenShift components deployed on them are managed by ROSA Service SREs.
+{rosa-classic-short} clusters include infrastructure nodes where OpenShift components such as the ingress controller, image registry, and monitoring are deployed. The infrastructure nodes and the OpenShift components deployed on them are managed by ROSA Service SREs.
 
-The following types of clusters are available with ROSA Classic:
+The following types of clusters are available with {rosa-classic-short}:
 
 * Single zone cluster - The control plane and worker nodes are hosted on a single availability zone.
 

modules/rosa-hcp-architecture.adoc

@@ -5,21 +5,21 @@
 [id="rosa-hcp-architecture_{context}"]
 = ROSA with HCP architecture
 
-In {hcp-title-first}, the ROSA service hosts a highly-available, single-tenant OpenShift control plane. The hosted control plane is deployed across 3 availability zones with 2 API server instances and 3 etcd instances. 
+In {rosa-first}, the ROSA service hosts a highly-available, single-tenant OpenShift control plane. The hosted control plane is deployed across 3 availability zones with 2 API server instances and 3 etcd instances. 
 
 You can create a ROSA with HCP cluster with or without an internet-facing API server. Private API servers are only accessible from your VPC subnets. You access the hosted control plane through an AWS PrivateLink endpoint. 
 
 The worker nodes are deployed in your AWS account and run on your VPC private subnets. You can add additional private subnets from one or more availability zones to ensure high availability. Worker nodes are shared by OpenShift components and applications. OpenShift components such as the ingress controller, image registry, and monitoring are deployed on the worker nodes hosted on your VPC.
 
-.ROSA with HCP architecture
-image::544_OpenShift_ROSA-HCP_architecture-model.png[ROSA with HCP architecture]
+.{rosa-short} architecture
+image::544_OpenShift_ROSA-HCP_architecture-model.png[{rosa-short} architecture]
 
 [id="rosa-hcp-network-architecture_{context}"]
-== ROSA with HCP architecture on public and private networks
-With ROSA with HCP, you can create your clusters on public or private networks. The following images depict the architecture of both public and private networks.
+== {rosa-short} architecture on public and private networks
+With {rosa-short}, you can create your clusters on public or private networks. The following images depict the architecture of both public and private networks.
 
-.ROSA with HCP deployed on a public network
-image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-public.png[ROSA with HCP deployed on a public network]
+.{rosa-short} deployed on a public network
+image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-public.png[{rosa-short} deployed on a public network]
 
-.ROSA with HCP deployed on a private network
-image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-private.png[ROSA with HCP deployed on a private network]
+.{rosa-short} deployed on a private network
+image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-private.png[{rosa-short} deployed on a private network]