diff mbox series

[RFC,1/3] aws: Add support for the us-east availability zone

Message ID 20241108205040.571326-2-cel@kernel.org (mailing list archive)
State New
Headers show
Series Enable AWS for users in US/Eastern | expand

Checks

Context Check Description
mcgrof/vmtest-main-PR success PR summary
mcgrof/vmtest-main-VM_Test-3 success Logs for Setup and Run Make Targets (debian:testing)
mcgrof/vmtest-main-VM_Test-4 success Logs for Setup and Run Make Targets (debian:testing)
mcgrof/vmtest-main-VM_Test-5 success Logs for Setup and Run Make Targets (debian:testing)
mcgrof/vmtest-main-VM_Test-6 success Logs for Setup and Run Make Targets (fedora:latest)
mcgrof/vmtest-main-VM_Test-7 success Logs for Setup and Run Make Targets (fedora:latest)
mcgrof/vmtest-main-VM_Test-8 success Logs for Setup and Run Make Targets (fedora:latest)
mcgrof/vmtest-main-VM_Test-10 success Logs for Setup and Run Make Targets (opensuse/tumbleweed)
mcgrof/vmtest-main-VM_Test-9 success Logs for Setup and Run Make Targets (opensuse/tumbleweed)
mcgrof/vmtest-main-VM_Test-11 success Logs for Setup and Run Make Targets (opensuse/tumbleweed)
mcgrof/vmtest-main-VM_Test-2 success Logs for Run kdevops CI
mcgrof/vmtest-main-VM_Test-1 success Logs for Run kdevops CI
mcgrof/vmtest-main-VM_Test-0 success Logs for Run kdevops CI

Commit Message

Chuck Lever Nov. 8, 2024, 8:50 p.m. UTC 
From: Chuck Lever <chuck.lever@oracle.com>

AWS steers my instances into us_east-1 or us_east-2, as I am in the
US/Eastern time zone.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 terraform/aws/Kconfig | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index a94045afcfee..7c134e957f6e 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -4,6 +4,11 @@  choice
 	prompt "AWS region to use"
 	default TERRAFORM_AWS_US_WEST_2
 
+config TERRAFORM_AWS_US_EAST_1
+	bool "us-east-1 - N. Virginia"
+	help
+	  This option will set the AWS region to us-east-1.
+
 config TERRAFORM_AWS_US_WEST_1
 	bool "us-west-1 - North California"
 	help
@@ -54,6 +59,7 @@  config TERRAFORM_AWS_REGION
 	string
 	default "us-west-2" if TERRAFORM_AWS_US_WEST_2
 	default "us-west-1" if TERRAFORM_AWS_US_WEST_1
+	default "us-east-1" if TERRAFORM_AWS_US_EAST_1
 
 if TERRAFORM_AWS_US_WEST_2
 
@@ -93,6 +99,7 @@  config TERRAFORM_AWS_AV_REGION
 	default "us-west-1b" if TERRAFORM_AWS_AV_REGION_WEST_1B
 	default "us-west-2b" if TERRAFORM_AWS_AV_REGION_WEST_2B
 	default "us-west-2d" if TERRAFORM_AWS_AV_REGION_WEST_2D
+	default "us-east-1a" if TERRAFORM_AWS_US_EAST_1
 
 choice
 	prompt "AWS AMI owner"
@@ -123,6 +130,12 @@  config TERRAFORM_AWS_RHEL9_X86_64
 	help
 	  This option will set AWS AMI owner to RHEL9 for x86_64.
 
+config TERRAFORM_AWS_RHEL9_X86_64_EAST
+	bool "RHEL9 x86_64 - ami-0de7e7cc68b747751"
+	depends on TARGET_ARCH_X86_64 && TERRAFORM_AWS_US_EAST_1
+	help
+	  This option will set AWS AMI owner to RHEL9 for x86_64.
+
 config TERRAFORM_AWS_RHEL9_ARM64
 	bool "RHEL9 x86_64 - ami-08911268ee09cb08e"
 	depends on TARGET_ARCH_ARM64 && TERRAFORM_AWS_US_WEST_2
@@ -209,7 +222,7 @@  config TERRAFORM_AWS_AMI_OWNER
 	string
 	default TERRAFORM_AWS_AMI_DEBIAN_OWNER if TERRAFORM_AWS_AMI_DEBIAN
 	default "137112412989" if TERRAFORM_AWS_AMI_AMAZON_X86_64 || TERRAFORM_AWS_AMI_AMAZON_ARM64
-	default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64
+	default "309956199498" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_ARM64 || TERRAFORM_AWS_RHEL9_X86_64_EAST
 	default "013907871322" if TERRAFORM_AWS_SLE15_SP4_X86_64 || TERRAFORM_AWS_SLE15_SP4_ARM64
 	help
 	  This option will set AWS AMI owner.
@@ -225,6 +238,7 @@  config TERRAFORM_AWS_NS
 	default "al2023-*-x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_AMI_AMAZON_X86_64
 	default "al2023-*-arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_AMI_AMAZON_ARM64
 	default "RHEL-9.*x86_64-*" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_RHEL9_X86_64
+	default "RHEL-9.*x86_64-*" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_RHEL9_X86_64_EAST
 	default "RHEL-9.*arm64-*" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_RHEL9_ARM64
 	default "suse-sles-15-sp4-*x86_64" if TARGET_ARCH_X86_64 && TERRAFORM_AWS_SLE15_SP4_X86_64
 	default "suse-sles-15-sp4-*arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_SLE15_SP4_ARM64