Skip to content

Commit 4f2ffd7

Browse files
authored
Merge pull request #55321 from mletalie/OSDOCS-4915
Updating ROSA docs to match AWS docs in regards to NLB, ELB, CLB, etc.
2 parents 642bc58 + 4460c94 commit 4f2ffd7

7 files changed

+10
-11
lines changed

modules/ccs-aws-provisioned.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Volume requirements for each EC2 instance:
4848
[id="aws-policy-elastic-load-balancers_{context}"]
4949
== Elastic load balancers
5050

51-
Up to two Network Elastic Load Balancers (ELBs) for API and up to two Classic ELBs for application router. For more information, see the link:https://aws.amazon.com/elasticloadbalancing/features/#Details_for_Elastic_Load_Balancing_Products[ELB documentation for AWS].
51+
Up to two Network Load Balancers (NLBs) for API and up to two Classic Load Balancers (CLBs) for application router. For more information, see the link:https://aws.amazon.com/elasticloadbalancing/features/#Details_for_Elastic_Load_Balancing_Products[ELB documentation for AWS].
5252

5353
[id="aws-policy-s3-storage_{context}"]
5454
== S3 storage

modules/dedicated-configuring-your-application-routes.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
= Configuring your application routes
77

88
When your cluster is provisioned, an AWS elastic load balancer (ELB) is created
9-
to route application traffic into the cluster. The domain for your ELB is
10-
configured to route application traffic via
9+
to route application traffic into the cluster. The domain for your ELB is configured to route application traffic via
1110
`http(s)://*.<cluster-id>.<shard-id>.p1.openshiftapps.com`. The `<shard-id>` is a
1211
random four-character string assigned to your cluster at creation time.
1312

modules/installation-aws-permissions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ If you use an existing VPC, your account does not require these permissions for
155155
156156
[NOTE]
157157
=====
158-
If you have not created an elastic load balancer (ELB) in your AWS account, the IAM user also requires the `iam:CreateServiceLinkedRole` permission.
158+
If you have not created a load balancer in your AWS account, the IAM user also requires the `iam:CreateServiceLinkedRole` permission.
159159
=====
160160
====
161161

modules/rosa-aws-provisioned.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ Clusters deployed before the release of {OCP} 4.11 use gp2 type storage by defau
4949
====
5050

5151
[id="rosa-elastic-load-balancers_{context}"]
52-
== Elastic load balancers
52+
== Elastic Load Balancing
5353

54-
Up to two Network Elastic Load Balancers (ELBs) for API and up to two Classic ELBs for application router. For more information, see the link:https://aws.amazon.com/elasticloadbalancing/features/#Details_for_Elastic_Load_Balancing_Products[ELB documentation for AWS].
54+
Up to two Network Load Balancers (NLBs) for API and up to two Classic Load Balancers (CLBs) for application router. For more information, see the link:https://aws.amazon.com/elasticloadbalancing/features/#Details_for_Elastic_Load_Balancing_Products[ELB documentation for AWS].
5555

5656
[id="rosa-s3-storage_{context}"]
5757
== S3 storage

modules/rosa-sts-aws-requirements-account.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Quota verification checks your AWS quota, but it does not compare your consumpti
1515
* Your AWS account should not be transferable to Red Hat.
1616
* You should not impose additional AWS usage restrictions beyond the defined roles and policies on Red Hat activities. Imposing restrictions will severely hinder Red Hat's ability to respond to incidents.
1717
* You may deploy native AWS services within the same AWS account.
18-
* Your account must have a service-linked role set up as it is required for elastic load balancers (ELBs) to be configured. See the "Creating the service role for the elastic load balancer (ELB)" link in the Additional resources for information about creating a service-linked role for your ELB if you have not created a load balancer in your AWS account previously.
18+
* Your account must have a service-linked role set up as it is required for Elastic Load Balancing (ELB) to be configured. See the "Creating the Elastic Load Balancing (ELB) service-linked role" link in the Additional resources for information about creating a service-linked role for your ELB if you have not created a load balancer in your AWS account previously.
1919
+
2020
[NOTE]
2121
====

modules/rosa-troubleshooting-elb-service-role.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
//
33
// * rosa_getting_started_sts/rosa-sts-aws-prereqs.adoc
44
:_content-type: PROCEDURE
5-
[id="rosa-troubleshooting-elb-serivce-role_{context}"]
6-
= Creating the service role for the elastic load balancer (ELB)
5+
[id="rosa-troubleshooting-elb-service-role_{context}"]
6+
= Creating the Elastic Load Balancing (ELB) service-linked role
77

8-
If you have not created a load balancer in your AWS account, it is possible that the service role for the elastic load balancer (ELB) might not exist yet. You may receive the following error:
8+
If you have not created a load balancer in your AWS account, it is possible that the service-linked role for Elastic Load Balancing (ELB) might not exist yet. You may receive the following error:
99

1010
[source,terminal]
1111
----

rosa_planning/rosa-sts-aws-prereqs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include::modules/rosa-sts-aws-requirements-account.adoc[leveloffset=+2]
2929
[id="additional-resources_aws-account-requirements_{context}"]
3030
.Additional resources
3131
* xref:../rosa_planning/rosa-limits-scalability.adoc#rosa-limits-scalability[Limits and scalability]
32-
* xref:../rosa_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-general-deployment-elb[Creating the service role for the elastic load balancer (ELB)]
32+
* xref:../rosa_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-general-deployment-elb[Creating the Elastic Load Balancing (ELB) service-linked role]
3333

3434
include::modules/rosa-sts-aws-requirements-access-req.adoc[leveloffset=+2]
3535

0 commit comments

Comments
 (0)