text edits

Author: jneczypor

modules/rosa-architecture.adoc

@@ -2,43 +2,29 @@
 //
 // * rosa_architecture/rosa_architecture_sub/rosa-architecture-models.adoc
 
-= ROSA with HCP architecture
-
-In ROSA with HCP, the ROSA service hosts a highly-available, single-tenant OpenShift control plane. The hosted control plane is deployed across 3 availability zones with at least 2 API server instances and three etcd instances. It is only accessible from the customer's VPC subnets. Customers access the hosted control plane through AWS PrivateLink. Customers can add an optional internet-facing API server endpoint to their ROSA with HCP cluster.
-
-The worker nodes are deployed in the customer's AWS account and run on the customer's VPC subnets. Customers can add one or more private subnets to the cluster VPC 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 the customer's VPC.
-
+[id="rosa-classic-architecture_{context}"]
 = ROSA Classic architecture
 
 In ROSA Classic, both the control plane and the worker nodes are deployed on the customer's VPC private subnets.
 
 Customers can customize access patterns for their API server endpoint and Red Hat SRE management in the following ways:
-* Public, where API Server endpoint and Application Routes are all internet-facing.
-* Private, where API Server endpoint and Application Routes are private
-* Private with Private Link, where API Server endpoint and Application Routes are private, public subnets or NAT Gateways are not required in your VPC for egress, ROSA Service SRE Management uses AWS Private Link. 
+* Public - API server endpoint and application routes are internet-facing.
+* Private - API server endpoint and application routes are private.
+* Private with Private Link - 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 Private Link. 
 
 Note that although Public Subnets are needed in Private ROSA Classic clusters, no Control Plane or Worker nodes are deployed in public subnets. 
 
 In ROSA Classic, you can create either a zonal cluster, where Control Plane and Worker Nodes are hosted on a single AZ or regional cluster, where Control Plane is hosted on 3 AZs with an option to run Worker nodes on 1 or 3 AZs. 
 
 ROSA Classic clusters include Infrastructure Nodes in addition to Control Plane where OpenShift components such as Ingress Controller, Image Registry, and Monitoring are deployed. The Infrastructure Nodes and the OpenShift components deployed on them are managed by ROSA Service SRE. 
 
-
-[id="rosa-architecture_{context}"]
-= ROSA architecture on public and private networks
+[id="rosa-classic-architecture-networks_{context}"]
+== ROSA Classic architecture on public and private networks
 
 You can install ROSA using either a public or private network. Configure a private cluster and private network connection during or after the cluster creation process.
 Red Hat manages the cluster with limited access through a public network. For more information, see xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-service-definition[ROSA service definition].
 
 .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]
 
-If you are using {hcp-title-first}, you can create your clusters on public and private networks as well. The following images depict the architecture of both public and private networks.
-
-.ROSA with HCP deployed on a public network
-image::ROSA-HCP-and-ROSA-Classic-public.png[ROSA with HCP deployed on a public network]
-
-.ROSA with HCP deployed on a private network
-image::ROSA-HCP-and-ROSA-Classic-private.png[ROSA with HCP deployed on a private network]
-
 Alternatively, you can install a ROSA Classic cluster using AWS PrivateLink, which is hosted on private subnets only.

modules/rosa-hcp-architecture.adoc

@@ -0,0 +1,20 @@
+// Module included in the following assemblies:
+//
+// * rosa_architecture/rosa_architecture_sub/rosa-architecture-models.adoc
+
+[id="rosa-hcp-architecture_{context}"]
+= ROSA with HCP architecture
+
+In ROSA with HCP, the ROSA service hosts a highly-available, single-tenant OpenShift control plane. The hosted control plane is deployed across 3 availability zones with at least 2 API server instances and three etcd instances. It is only accessible from the customer's VPC subnets. Customers access the hosted control plane through AWS PrivateLink. Customers can add an optional internet-facing API server endpoint to their ROSA with HCP cluster.
+
+The worker nodes are deployed in the customer's AWS account and run on the customer's VPC subnets. Customers can add one or more private subnets to the cluster VPC 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 the customer's VPC.
+
+[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 with HCP deployed on a public network
+image::ROSA-HCP-and-ROSA-Classic-public.png[ROSA with HCP deployed on a public network]
+
+.ROSA with HCP deployed on a private network
+image::ROSA-HCP-and-ROSA-Classic-private.png[ROSA with HCP deployed on a private network]

modules/rosa-hcp-classic-comparison.adoc

@@ -4,12 +4,14 @@
 
 :_mod-docs-content-type: CONCEPT
 [id="rosa-hcp-classic-comparison_{context}"]
-= Comparing ROSA with hosted control planes and ROSA Classic
+= Comparing ROSA with HCP and ROSA Classic
 
 {hcp-title-first} offers a different way to create a managed {product-title} (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-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.
 
+//should the above paragraphs be moved to an "About" section?
+
 .ROSA architectures comparison table
 
 [cols="3a,8a,8a",options="header"]
@@ -83,7 +85,7 @@
 [id="rosa-hcp-classic-comparison-networks_{context}"]
 == ROSA architecture network comparisons
 
-ROSA Classic and ROSA with HCP offer options to install your cluster on public and private networks. The following images show the differences between these options.
+ROSA with HCP and ROSA Classic offer options to install your cluster on public and private networks. The following images show the differences between these options.
 
 .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_architecture/rosa_architecture_sub/rosa-architecture-models.adoc

@@ -6,7 +6,7 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
 
 toc::[]
 
-ROSA has the following custer topologies:
+ROSA has the following cluster topologies:
 
 * Hosted Control Plane (HCP) - The control plane is hosted in a Red Hat account and the worker nodes are deployed in the customer's AWS account.
 * Classic - The control plane and the worker nodes are deployed in the customer's AWS account.
@@ -19,6 +19,7 @@ include::modules/rosa-hcp-classic-comparison.adoc[leveloffset=+1]
 //* Private network
 //* AWS PrivateLink (ROSA Classic only)
 
+include::modules/rosa-hcp-architecture.adoc[leveloffset=+1]
 include::modules/rosa-architecture.adoc[leveloffset=+1]
 include::modules/osd-aws-privatelink-architecture.adoc[leveloffset=+1]
 include::modules/rosa-architecture-local-zones.adoc[leveloffset=+1]