Merge pull request #55545 from mletalie/OSDOCS-4808v2

Author: adellape

modules/cluster-wide-proxy-preqs.adoc

@@ -22,7 +22,7 @@ ifdef::openshift-dedicated[]
 * You are using the Customer Cloud Subscription (CCS) model for your cluster.
 endif::openshift-dedicated[]
 * The proxy can access the VPC for the cluster and the private subnets of the VPC. The proxy is also accessible from the VPC for the cluster and from the private subnets of the VPC.
-* You have added the `ec2.<region>.amazonaws.com`, `elasticloadbalancing.<region>.amazonaws.com`, and `s3.<region>.amazonaws.com` endpoints to your VPC endpoint. These endpoints are required to complete requests from the nodes to the AWS EC2 API. Because the proxy works at the container level and not at the node level, you must route these requests to the AWS EC2 API through the AWS private network. Adding the public IP address of the EC2 API to your allowlist in your proxy server is not enough.
+* You have added the `ec2.<aws_region>.amazonaws.com`, `elasticloadbalancing.<aws_region>.amazonaws.com`, and `s3.<aws_region>.amazonaws.com` endpoints to your VPC endpoint. These endpoints are required to complete requests from the nodes to the AWS EC2 API. Because the proxy works at the container level and not at the node level, you must route these requests to the AWS EC2 API through the AWS private network. Adding the public IP address of the EC2 API to your allowlist in your proxy server is not enough.
 
 [discrete]
 [id="cluster-wide-proxy-network-prereqs_{context}"]

modules/installation-aws-user-infra-requirements.adoc

@@ -40,9 +40,9 @@ If you are working in a disconnected environment, you are unable to reach the pu
 
 Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
 
-* `ec2.<region>.amazonaws.com`
-* `elasticloadbalancing.<region>.amazonaws.com`
-* `s3.<region>.amazonaws.com`
+* `ec2.<aws_region>.amazonaws.com`
+* `elasticloadbalancing.<aws_region>.amazonaws.com`
+* `s3.<aws_region>.amazonaws.com`
 
 With this option, network traffic remains private between your VPC and the required AWS services.
 
@@ -56,9 +56,9 @@ As part of the installation process, you can configure an HTTP or HTTPS proxy. W
 === Option 3: Create a proxy with VPC endpoints
 As part of the installation process, you can configure an HTTP or HTTPS proxy with VPC endpoints. Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
 
-* `ec2.<region>.amazonaws.com`
-* `elasticloadbalancing.<region>.amazonaws.com`
-* `s3.<region>.amazonaws.com`
+* `ec2.<aws_region>.amazonaws.com`
+* `elasticloadbalancing.<aws_region>.amazonaws.com`
+* `s3.<aws_region>.amazonaws.com`
 
 When configuring the proxy in the `install-config.yaml` file, add these endpoints to the `noProxy` field. With this option, the proxy prevents the cluster from accessing the internet directly. However, network traffic remains private between your VPC and the required AWS services.
 

modules/installation-configure-proxy.adoc

@@ -203,7 +203,7 @@ ifndef::aws[]
   noProxy: example.com <3>
 endif::aws[]
 ifdef::aws[]
-  noProxy: ec2.<region>.amazonaws.com,elasticloadbalancing.<region>.amazonaws.com,s3.<region>.amazonaws.com <3>
+  noProxy: ec2.<aws_region>.amazonaws.com,elasticloadbalancing.<aws_region>.amazonaws.com,s3.<aws_region>.amazonaws.com <3>
 endif::aws[]
 additionalTrustBundle: | <4>
     -----BEGIN CERTIFICATE-----

modules/installation-creating-aws-bootstrap.adoc

@@ -109,19 +109,19 @@ The bootstrap Ignition config file does contain secrets, like X.509 keys. The fo
   },
   {
     "ParameterKey": "RegisterNlbIpTargetsLambdaArn", <17>
-    "ParameterValue": "arn:aws:lambda:<region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <18>
+    "ParameterValue": "arn:aws:lambda:<aws_region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <18>
   },
   {
     "ParameterKey": "ExternalApiTargetGroupArn", <19>
-    "ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <20>
+    "ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <20>
   },
   {
     "ParameterKey": "InternalApiTargetGroupArn", <21>
-    "ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <22>
+    "ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <22>
   },
   {
     "ParameterKey": "InternalServiceTargetGroupArn", <23>
-    "ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <24>
+    "ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <24>
   }
 ]
 

modules/installation-creating-aws-control-plane.adoc

@@ -100,19 +100,19 @@ requires:
   },
   {
     "ParameterKey": "RegisterNlbIpTargetsLambdaArn", <25>
-    "ParameterValue": "arn:aws:lambda:<region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <26>
+    "ParameterValue": "arn:aws:lambda:<aws_region>:<account_number>:function:<dns_stack_name>-RegisterNlbIpTargets-<random_string>" <26>
   },
   {
     "ParameterKey": "ExternalApiTargetGroupArn", <27>
-    "ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <28>
+    "ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Exter-<random_string>" <28>
   },
   {
     "ParameterKey": "InternalApiTargetGroupArn", <29>
-    "ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <30>
+    "ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <30>
   },
   {
     "ParameterKey": "InternalServiceTargetGroupArn", <31>
-    "ParameterValue": "arn:aws:elasticloadbalancing:<region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <32>
+    "ParameterValue": "arn:aws:elasticloadbalancing:<aws_region>:<account_number>:targetgroup/<dns_stack_name>-Inter-<random_string>" <32>
   }
 ]
 ----

modules/installation-custom-aws-vpc.adoc

@@ -82,26 +82,26 @@ endif::aws-secret[]
 Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
 
 ifndef::aws-china,aws-secret[]
-* `ec2.<region>.amazonaws.com`
-* `elasticloadbalancing.<region>.amazonaws.com`
-* `s3.<region>.amazonaws.com`
+* `ec2.<aws_region>.amazonaws.com`
+* `elasticloadbalancing.<aws_region>.amazonaws.com`
+* `s3.<aws_region>.amazonaws.com`
 endif::aws-china,aws-secret[]
 
 ifdef::aws-china[]
-* `ec2.<region>.amazonaws.com.cn`
-* `elasticloadbalancing.<region>.amazonaws.com`
-* `s3.<region>.amazonaws.com`
+* `ec2.<aws_region>.amazonaws.com.cn`
+* `elasticloadbalancing.<aws_region>.amazonaws.com`
+* `s3.<aws_region>.amazonaws.com`
 endif::aws-china[]
 
 ifdef::aws-secret[]
 SC2S::
-** `elasticloadbalancing.<region>.sc2s.sgov.gov`
-** `ec2.<region>.sc2s.sgov.gov`
-** `s3.<region>.sc2s.sgov.gov`
+** `elasticloadbalancing.<aws_region>.sc2s.sgov.gov`
+** `ec2.<aws_region>.sc2s.sgov.gov`
+** `s3.<aws_region>.sc2s.sgov.gov`
 C2S::
-** `elasticloadbalancing.<region>.c2s.ic.gov`
-** `ec2.<region>.c2s.ic.gov`
-** `s3.<region>.c2s.ic.gov`
+** `elasticloadbalancing.<aws_region>.c2s.ic.gov`
+** `ec2.<aws_region>.c2s.ic.gov`
+** `s3.<aws_region>.c2s.ic.gov`
 endif::aws-secret[]
 
 With this option, network traffic remains private between your VPC and the required AWS services.
@@ -117,26 +117,26 @@ As part of the installation process, you can configure an HTTP or HTTPS proxy. W
 As part of the installation process, you can configure an HTTP or HTTPS proxy with VPC endpoints. Create a VPC endpoint and attach it to the subnets that the clusters are using. Name the endpoints as follows:
 
 ifndef::aws-china,aws-secret[]
-* `ec2.<region>.amazonaws.com`
-* `elasticloadbalancing.<region>.amazonaws.com`
-* `s3.<region>.amazonaws.com`
+* `ec2.<aws_region>.amazonaws.com`
+* `elasticloadbalancing.<aws_region>.amazonaws.com`
+* `s3.<aws_region>.amazonaws.com`
 endif::aws-china,aws-secret[]
 
 ifdef::aws-china[]
-* `ec2.<region>.amazonaws.com.cn`
-* `elasticloadbalancing.<region>.amazonaws.com`
-* `s3.<region>.amazonaws.com`
+* `ec2.<aws_region>.amazonaws.com.cn`
+* `elasticloadbalancing.<aws_region>.amazonaws.com`
+* `s3.<aws_region>.amazonaws.com`
 endif::aws-china[]
 
 ifdef::aws-secret[]
 SC2S::
-** `elasticloadbalancing.<region>.sc2s.sgov.gov`
-** `ec2.<region>.sc2s.sgov.gov`
-** `s3.<region>.sc2s.sgov.gov`
+** `elasticloadbalancing.<aws_region>.sc2s.sgov.gov`
+** `ec2.<aws_region>.sc2s.sgov.gov`
+** `s3.<aws_region>.sc2s.sgov.gov`
 C2S::
-** `elasticloadbalancing.<region>.c2s.ic.gov`
-** `ec2.<region>.c2s.ic.gov`
-** `s3.<region>.c2s.ic.gov`
+** `elasticloadbalancing.<aws_region>.c2s.ic.gov`
+** `ec2.<aws_region>.c2s.ic.gov`
+** `s3.<aws_region>.c2s.ic.gov`
 endif::aws-secret[]
 
 When configuring the proxy in the `install-config.yaml` file, add these endpoints to the `noProxy` field. With this option, the proxy prevents the cluster from accessing the internet directly. However, network traffic remains private between your VPC and the required AWS services.

modules/rosa-sts-setting-up-environment.adoc

@@ -142,7 +142,7 @@ I: Logged in as '<rh-rosa-user>' on 'https://api.openshift.com'
 +
 [source,terminal]
 ----
-$ rosa verify quota [--region=<region>]
+$ rosa verify quota [--region=<aws_region>]
 ----
 +
 .Example output

modules/storage-persistent-storage-efs-provisioner.adoc

@@ -63,7 +63,7 @@ spec:
   volumes:
     - name: pv-volume
       nfs:
-        server: <file-system-id>.efs.<region>.amazonaws.com <1>
+        server: <file-system-id>.efs.<aws_region>.amazonaws.com <1>
         path: / <2>
 ----
 <1> Contains the DNS name of the EFS volume. This field must be updated