From patchwork Tue Jan 14 20:03:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13939434 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 178F820A5D2 for ; Tue, 14 Jan 2025 20:03:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736885034; cv=none; b=lkojUD5WjpSihLLsOytyghtFIU1tyN/jP9T8NKo8n3K9YODdDdaEKq60KIWNxD90qGXSZGo6qJ8e6b3RtqLFdtaYcOjqaZCgKSTPb+y1rey2dYQix+r0bjIxJz+W5yhDpAiq6YMq20thMO9OOj0poI7Vq5NSVTP9IsPoj5rE5FU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736885034; c=relaxed/simple; bh=buWJi/CJuih/yFOl2cliAbMED4breqDZ6gp1rPydePk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lWRifkolzwmqtLjXads5AligkcBk3dF5pLG0KdpLKkqENtDHuIVdkHyjqxGyX1GqDL/Mxs1mR3biK9NlcGEhBHoywSTL6VdfH36ltq1GmsYsA8T4oQwSQAhBEV+fqP5jPZ73Y+1OwDksyiJWABXDRgJssLzIl8LR6AWz4qzmUHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eOov5WZk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eOov5WZk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA0CBC4CEDD; Tue, 14 Jan 2025 20:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736885034; bh=buWJi/CJuih/yFOl2cliAbMED4breqDZ6gp1rPydePk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOov5WZkH8zyq4YQUz4xLSUbbCioz5/OfMdIg7079uN7FH60zkoCrrbLLSsl5NAAR K7+cIMQMQ/ZN3Cs3U4itctyB3kK67bj5aKTWQASpJij9dWRLQyOlRf8ErwUhTxZPVq y9Zh0CgGmBLMnEuXWKaCL82t2aDUFPjDsNS78E2eUbOJpy+KTihWKkldL66KFcd5A0 LaxSfBseDd3K/oCU6m0QjNjH9jpJW2RI+DVBdz6fnFs7TFz43U78dHX49D8rcDfmxl JIawLAIl24T/ORYkuEb2UmdDjhEaej8ei41mdIE/GwsIS+Pahxg3OaWvMqjwJIiLUk 7wk0ZFDJ9p/ZA== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v1 6/9] terraform/aws: Enable selection of a Fedora (40) AMI Date: Tue, 14 Jan 2025 15:03:45 -0500 Message-ID: <20250114200348.1706018-7-cel@kernel.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114200348.1706018-1-cel@kernel.org> References: <20250114200348.1706018-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever 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 --- 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