Skip to content

Commit 28a3052

Browse files
authored
Merge pull request #97793 from bscott-rh/OCPBUGS-54405-4.12
[enterprise-4.12] OCPBUGS#54405 removing invalid parameters from AWS
2 parents 9057b80 + 1d010b9 commit 28a3052

File tree

1 file changed

+14
-19
lines changed

1 file changed

+14
-19
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -805,21 +805,6 @@ such as `io1`.
805805
|A list of valid AWS availability zones, such as `us-east-1c`, in a
806806
link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
807807

808-
|`compute.aws.region`
809-
|The AWS region that the installation program creates compute resources in.
810-
|Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`. You can use the AWS CLI to access the regions available based on your selected instance type. For example:
811-
[source,terminal]
812-
----
813-
aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
814-
----
815-
ifndef::openshift-origin[]
816-
[IMPORTANT]
817-
====
818-
When running on ARM based AWS instances, ensure that you enter a region where AWS Graviton processors are available. See link:https://aws.amazon.com/ec2/graviton/#Global_availability[Global availability] map in the AWS documentation. Currently, AWS Graviton3 processors are only available in some regions.
819-
====
820-
endif::openshift-origin[]
821-
822-
823808
|`controlPlane.platform.aws.amiID`
824809
|The AWS AMI used to boot control plane machines for the cluster. This is required for regions that require a custom {op-system} AMI.
825810
|Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
@@ -841,10 +826,6 @@ endif::openshift-origin[]
841826
control plane machine pool.
842827
|A list of valid AWS availability zones, such as `us-east-1c`, in a link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
843828

844-
|`controlPlane.aws.region`
845-
|The AWS region that the installation program creates control plane resources in.
846-
|Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`.
847-
848829
|`platform.aws.amiID`
849830
|The AWS AMI used to boot all machines for the cluster. If set, the AMI must
850831
belong to the same region as the cluster. This is required for regions that require a custom {op-system} AMI.
@@ -861,6 +842,20 @@ can be specified for EC2, S3, IAM, Elastic Load Balancing, Tagging, Route 53,
861842
and STS AWS services.
862843
|Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS service endpoint] name.
863844

845+
|`platform.aws.region`
846+
|The AWS region that the installation program creates all cluster resources in.
847+
|Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`. You can use the AWS CLI to access the regions available based on your selected instance type by running the following command:
848+
[source,terminal]
849+
----
850+
$ aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
851+
----
852+
ifndef::openshift-origin[]
853+
[IMPORTANT]
854+
====
855+
When running on ARM based AWS instances, ensure that you enter a region where AWS Graviton processors are available. See link:https://aws.amazon.com/ec2/graviton/#Global_availability[Global availability] map in the AWS documentation. Currently, AWS Graviton3 processors are only available in some regions.
856+
====
857+
endif::openshift-origin[]
858+
864859
|`platform.aws.serviceEndpoints.url`
865860
|The AWS service endpoint URL. The URL must use the `https` protocol and the
866861
host must trust the certificate.

0 commit comments

Comments
 (0)