diff mbox series

[v1,6/9] terraform/aws: Enable selection of a Fedora (40) AMI

Message ID 20250114200348.1706018-7-cel@kernel.org (mailing list archive)
State New
Headers show
Series Random short subjects | expand

Commit Message

Chuck Lever Jan. 14, 2025, 8:03 p.m. UTC 
From: Chuck Lever <chuck.lever@oracle.com>

For the RedHat-o-philes, add an option to allow selection of a
flavor of Fedora for the target nodes.

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

Patch

diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index 7d02a8ff63c2..cb84b3d89ea4 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -124,6 +124,18 @@  config TERRAFORM_AWS_AMI_AMAZON_ARM64
 	help
 	  This option will set AWS AMI owner to Amazon EC2 images for arm64.
 
+config TERRAFORM_AWS_FEDORA40_X86_64
+	bool "Fedora 40 on x86_64"
+	depends on TARGET_ARCH_X86_64
+	help
+	  This option sets the AWS AMI owner to Fedora 40 for x86_64.
+
+config TERRAFORM_AWS_FEDORA40_ARM64
+	bool "Fedora 40 on aarch64"
+	depends on TARGET_ARCH_ARM64
+	help
+	  This option sets the AWS AMI owner to Fedora 40 for ARM 64-bit.
+
 config TERRAFORM_AWS_RHEL9_X86_64
 	bool "RHEL9 x86_64 - ami-0dda7e535b65b6469"
 	depends on TARGET_ARCH_X86_64 && TERRAFORM_AWS_US_WEST_2
@@ -137,7 +149,7 @@  config TERRAFORM_AWS_RHEL9_X86_64_EAST
 	  This option will set AWS AMI owner to RHEL9 for x86_64.
 
 config TERRAFORM_AWS_RHEL9_ARM64
-	bool "RHEL9 x86_64 - ami-08911268ee09cb08e"
+	bool "RHEL9 ARM 64 - ami-08911268ee09cb08e"
 	depends on TARGET_ARCH_ARM64 && TERRAFORM_AWS_US_WEST_2
 	help
 	  This option will set AWS AMI owner to RHEL9 for ARM64
@@ -224,8 +236,9 @@  config TERRAFORM_AWS_AMI_OWNER
 	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 || TERRAFORM_AWS_RHEL9_X86_64_EAST
 	default "013907871322" if TERRAFORM_AWS_SLE15_SP4_X86_64 || TERRAFORM_AWS_SLE15_SP4_ARM64
+	default "125523088429" if TERRAFORM_AWS_FEDORA40_X86_64 || TERRAFORM_AWS_FEDORA40_ARM64
 	help
-	  This option will set AWS AMI owner.
+	  This option specifies the AWS AMI owner.
 
 config TERRAFORM_AWS_NS
 	string
@@ -239,6 +252,8 @@  config TERRAFORM_AWS_NS
 	default "al2023-*-arm64" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_AMI_AMAZON_ARM64
 	default "RHEL-9.*x86_64-*" if TERRAFORM_AWS_RHEL9_X86_64 || TERRAFORM_AWS_RHEL9_X86_64_EAST
 	default "RHEL-9.*arm64-*" if TARGET_ARCH_ARM64 && TERRAFORM_AWS_RHEL9_ARM64
+	default "Fedora-Cloud-Base-AmazonEC2.x86_64-40-*" if TERRAFORM_AWS_FEDORA40_X86_64
+	default "Fedora-Cloud-Base-AmazonEC2.aarch64-40-*" if TERRAFORM_AWS_FEDORA40_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
 	help