From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH v1 6/9] terraform/aws: Enable selection of a Fedora (40) AMI
Date: Tue, 14 Jan 2025 15:03:45 -0500 [thread overview]
Message-ID: <20250114200348.1706018-7-cel@kernel.org> (raw)
In-Reply-To: <20250114200348.1706018-1-cel@kernel.org>
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 --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
--
2.47.1
next prev parent reply other threads:[~2025-01-14 20:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-14 20:03 [PATCH v1 0/9] Random short subjects cel
2025-01-14 20:03 ` [PATCH v1 1/9] bringup: prevent the use of vagrant cel
2025-01-14 20:03 ` [PATCH v1 2/9] Remove defconfigs/nfsd cel
2025-01-14 20:03 ` [PATCH v1 3/9] terraform/aws: Clean up a few nits cel
2025-01-14 20:03 ` [PATCH v1 4/9] Clean up task messages cel
2025-01-14 20:03 ` [PATCH v1 5/9] devconfig: Replace import_tasks with include_tasks cel
2025-01-28 13:03 ` Daniel Gomez
2025-01-28 14:20 ` Chuck Lever
2025-01-28 14:40 ` Daniel Gomez
2025-01-28 14:43 ` Chuck Lever
2025-01-14 20:03 ` cel [this message]
2025-01-14 20:03 ` [PATCH v1 7/9] terraform/aws: Add a couple more instance types cel
2025-01-14 20:03 ` [PATCH v1 8/9] terraform/aws: Add support for m7a " cel
2025-01-14 20:03 ` [PATCH v1 9/9] terraform: Hoist aws_profile into the terraform Kconfig cel
2025-01-17 21:05 ` [PATCH v1 0/9] Random short subjects Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250114200348.1706018-7-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.