Skip to content

Commit 63639fc

Browse files
committed
aws: Add the us-east-2 region
"us-east-2" happens to be closer to where I live and work. Signed-off-by: Chuck Lever <[email protected]>
1 parent 77c78c8 commit 63639fc

File tree

1 file changed

+41
-13
lines changed

1 file changed

+41
-13
lines changed

terraform/aws/Kconfig

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ config TERRAFORM_AWS_US_EAST_1
3939
help
4040
This option will set the AWS region to us-east-1.
4141

42+
config TERRAFORM_AWS_US_EAST_2
43+
bool "us-east-2 - Ohio"
44+
help
45+
This option will set the AWS region to us-east-2.
46+
4247
config TERRAFORM_AWS_US_WEST_1
4348
bool "us-west-1 - North California"
4449
help
@@ -89,6 +94,7 @@ config TERRAFORM_AWS_REGION
8994
string
9095
default "us-west-2" if TERRAFORM_AWS_US_WEST_2
9196
default "us-west-1" if TERRAFORM_AWS_US_WEST_1
97+
default "us-east-2" if TERRAFORM_AWS_US_EAST_2
9298
default "us-east-1" if TERRAFORM_AWS_US_EAST_1
9399

94100
if TERRAFORM_AWS_US_EAST_1
@@ -131,6 +137,31 @@ endchoice
131137

132138
endif # TERRAFORM_AWS_US_EAST_1
133139

140+
if TERRAFORM_AWS_US_EAST_2
141+
142+
choice
143+
prompt "AWS East 2 availability zone to use"
144+
default TERRAFORM_AWS_AV_REGION_EAST_2A
145+
146+
config TERRAFORM_AWS_AV_REGION_EAST_2A
147+
bool "us-east-2a"
148+
help
149+
This option selects us-east-2a availability zone.
150+
151+
config TERRAFORM_AWS_AV_REGION_EAST_2B
152+
bool "us-east-2b"
153+
help
154+
This option selects us-east-2a availability zone.
155+
156+
config TERRAFORM_AWS_AV_REGION_EAST_2C
157+
bool "us-east-2c"
158+
help
159+
This option selects us-east-2c availability zone.
160+
161+
endchoice
162+
163+
endif # TERRAFORM_AWS_US_EAST_2
164+
134165
if TERRAFORM_AWS_US_WEST_2
135166

136167
choice
@@ -175,6 +206,9 @@ config TERRAFORM_AWS_AV_REGION
175206
default "us-east-1d" if TERRAFORM_AWS_AV_REGION_EAST_1D
176207
default "us-east-1e" if TERRAFORM_AWS_AV_REGION_EAST_1E
177208
default "us-east-1f" if TERRAFORM_AWS_AV_REGION_EAST_1F
209+
default "us-east-2a" if TERRAFORM_AWS_AV_REGION_EAST_2A
210+
default "us-east-2b" if TERRAFORM_AWS_AV_REGION_EAST_2B
211+
default "us-east-2c" if TERRAFORM_AWS_AV_REGION_EAST_2C
178212

179213
choice
180214
prompt "AWS AMI owner"
@@ -212,20 +246,14 @@ config TERRAFORM_AWS_FEDORA40_ARM64
212246
This option sets the AWS AMI owner to Fedora 40 for ARM 64-bit.
213247

214248
config TERRAFORM_AWS_RHEL9_X86_64
215-
bool "RHEL9 x86_64 - ami-0dda7e535b65b6469"
216-
depends on TARGET_ARCH_X86_64 && TERRAFORM_AWS_US_WEST_2
217-
help
218-
This option will set AWS AMI owner to RHEL9 for x86_64.
219-
220-
config TERRAFORM_AWS_RHEL9_X86_64_EAST
221-
bool "RHEL9 x86_64 - ami-0de7e7cc68b747751"
222-
depends on TARGET_ARCH_X86_64 && TERRAFORM_AWS_US_EAST_1
249+
bool "RHEL9 x86_64"
250+
depends on TARGET_ARCH_X86_64
223251
help
224252
This option will set AWS AMI owner to RHEL9 for x86_64.
225253

226254
config TERRAFORM_AWS_RHEL9_ARM64
227-
bool "RHEL9 ARM 64 - ami-08911268ee09cb08e"
228-
depends on TARGET_ARCH_ARM64 && TERRAFORM_AWS_US_WEST_2
255+
bool "RHEL9 ARM 64"
256+
depends on TARGET_ARCH_ARM64
229257
help
230258
This option will set AWS AMI owner to RHEL9 for ARM64
231259

@@ -309,7 +337,7 @@ config TERRAFORM_AWS_AMI_OWNER
309337
string
310338
default TERRAFORM_AWS_AMI_DEBIAN_OWNER if TERRAFORM_AWS_AMI_DEBIAN
311339
default "137112412989" if TERRAFORM_AWS_AMI_AMAZON_X86_64 || TERRAFORM_AWS_AMI_AMAZON_ARM64
312-
default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64 || TERRAFORM_AWS_RHEL9_X86_64_EAST
340+
default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64
313341
default "013907871322" if TERRAFORM_AWS_SLE15_SP4_X86_64 || TERRAFORM_AWS_SLE15_SP4_ARM64
314342
default "125523088429" if TERRAFORM_AWS_FEDORA40_X86_64 || TERRAFORM_AWS_FEDORA40_ARM64
315343
help
@@ -325,8 +353,8 @@ config TERRAFORM_AWS_NS
325353
default "debian-stretch-hvm-arm64-*" if TERRAFORM_AWS_NS_DEBIAN_STRETCH_ARM64
326354
default "al2023-*-x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_AMI_AMAZON_X86_64
327355
default "al2023-*-arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_AMI_AMAZON_ARM64
328-
default "RHEL-9.*x86_64-*" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_X86_64_EAST
329-
default "RHEL-9.*arm64-*" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_RHEL9_ARM64
356+
default "RHEL-9.*x86_64-*" if TERRAFORM_AWS_RHEL9_X86_64
357+
default "RHEL-9.*arm64-*" if TERRAFORM_AWS_RHEL9_ARM64
330358
default "Fedora-Cloud-Base-AmazonEC2.x86_64-40-*" if TERRAFORM_AWS_FEDORA40_X86_64
331359
default "Fedora-Cloud-Base-AmazonEC2.aarch64-40-*" if TERRAFORM_AWS_FEDORA40_ARM64
332360
default "suse-sles-15-sp4-*x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_SLE15_SP4_X86_64

0 commit comments

Comments
 (0)