Skip to content

Commit b2a9d0d

Browse files
committed
OSDOCS-14434: Changed the ROSA name variables.
1 parent c226350 commit b2a9d0d

File tree

10 files changed

+316
-414
lines changed

10 files changed

+316
-414
lines changed

_attributes/attributes-openshift-dedicated.adoc

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
:sts-first: Security Token Service (STS)
2828
:sts-full: Security Token Service
2929
:sts-short: STS
30+
// ROSA specific
31+
:hcp: hosted control planes
32+
:rosa-first: Red Hat OpenShift Service on AWS (ROSA) with {hcp} (HCP)
33+
:rosa-short: ROSA with HCP
34+
:rosa-classic-first: {product-title} (ROSA) (classic architecture)
35+
:rosa-classic: Red Hat OpenShift Service on AWS (classic architecture)
36+
:rosa-classic-short: ROSA (classic)
37+
:classic: {rosa-classic}
38+
:classic-short: {rosa-classic-short}
3039
//logging
3140
:logging-title: logging for Red Hat OpenShift
3241
:logging-title-uc: Logging for Red Hat OpenShift
@@ -49,11 +58,6 @@
4958
//Formerly known as CodeReady Containers and CodeReady Workspaces
5059
:openshift-local-productname: Red Hat OpenShift Local
5160
:openshift-dev-spaces-productname: Red Hat OpenShift Dev Spaces
52-
:hcp: hosted control planes
53-
:hcp-title: ROSA with HCP
54-
:hcp-title-first: {product-title} (ROSA) with {hcp} (HCP)
55-
:rosa-classic: ROSA (classic architecture)
56-
:rosa-classic-first: {product-title} (ROSA) (classic architecture)
5761
:egress-lockdown: {hcp-title} clusters with zero egress
5862
//ROSA CLI variables
5963
:zero-egress: zero egress

_distro_map.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ openshift-aro:
196196
name: '4'
197197
dir: aro/4
198198
openshift-rosa:
199-
name: Red Hat OpenShift Service on AWS
199+
name: Red Hat OpenShift Service on AWS (classic architecture)
200200
author: OpenShift Documentation Project <[email protected]>
201201
site: commercial
202202
site_name: Documentation

modules/rosa-hcp-architecture.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
[id="rosa-hcp-architecture_{context}"]
66
= ROSA with HCP architecture
77

8-
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.
8+
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.
99

1010
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.
1111

1212
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.
1313

14-
.ROSA with HCP architecture
15-
image::544_OpenShift_ROSA-HCP_architecture-model.png[ROSA with HCP architecture]
14+
.{rosa-short} architecture
15+
image::544_OpenShift_ROSA-HCP_architecture-model.png[{rosa-short} architecture]
1616

1717
[id="rosa-hcp-network-architecture_{context}"]
18-
== ROSA with HCP architecture on public and private networks
19-
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.
18+
== {rosa-short} architecture on public and private networks
19+
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.
2020

21-
.ROSA with HCP deployed on a public network
22-
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-public.png[ROSA with HCP deployed on a public network]
21+
.{rosa-short} deployed on a public network
22+
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-public.png[{rosa-short} deployed on a public network]
2323

24-
.ROSA with HCP deployed on a private network
25-
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-private.png[ROSA with HCP deployed on a private network]
24+
.{rosa-short} deployed on a private network
25+
image::544_OpenShift_ROSA-HCP-and-ROSA-Classic-private.png[{rosa-short} deployed on a private network]

rosa_architecture/about-hcp.adoc

Lines changed: 0 additions & 264 deletions
This file was deleted.

rosa_cluster_admin/rosa_nodes/rosa-nodes-machinepools-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Each machine pool in a {product-title} cluster upgrades independently. Because t
9090

9191
The following image depicts how machine pools work within ROSA and {rosa-classic} clusters:
9292

93-
image::hcp-rosa-machine-pools.png[Machine pools on ROSA classic and {hcp-tilte} clusters]
93+
image::hcp-rosa-machine-pools.png[Machine pools on {rosa-classic-short} and {rosa-short} clusters]
9494

9595
[NOTE]
9696
====

0 commit comments

Comments
 (0)