[v1,7/9] terraform/aws: Add a couple more instance types

Commit Message

Chuck Lever Jan. 14, 2025, 8:03 p.m. UTC

From: Chuck Lever <[e-mail]>

The existing m5ad selections are still more than is needed for
some workflows, so introduce a couple of smaller ones.

Update the help text for these types to better reflect their
current provisions.

Signed-off-by: Chuck Lever <[e-mail]>
---
 kconfigs/workflows/Kconfig.shared |  2 ++
 terraform/aws/Kconfig             | 44 ++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

Patch

diff --git a/kconfigs/workflows/Kconfig.shared b/kconfigs/workflows/Kconfig.shared
index 91f86cf77af4..d05f31964684 100644
--- a/kconfigs/workflows/Kconfig.shared
+++ b/kconfigs/workflows/Kconfig.shared
@@ -35,6 +35,8 @@  if WORKFLOW_MAKE_CMD_OVERRIDE
 
 config WORKFLOW_MAKE_CMD
 	string "The make command to use when building"
+	default "make -j 2" if TERRAFORM_AWS_INSTANCE_M5AD_LARGE
+	default "make -j 4" if TERRAFORM_AWS_INSTANCE_M5AD_XLARGE
 	default "make -j 8" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "make -j 16" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "make -j 1" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS1_V2
diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig
index cb84b3d89ea4..42703ab2bec2 100644
--- a/terraform/aws/Kconfig
+++ b/terraform/aws/Kconfig
@@ -294,19 +294,53 @@  choice
 	default TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE if TARGET_ARCH_X86_64
 	default TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM if TARGET_ARCH_ARM64
 
+config TERRAFORM_AWS_INSTANCE_M5AD_LARGE
+	bool "m5ad.large"
+	depends on TARGET_ARCH_X86_64
+	help
+	  8 GiB RAM, 2 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps
+	  network speed, and one 75 GiB NVMe drive.
+
+	  Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
+	  option and adjusting the size and number of additional devices.
+
+	  See https://aws.amazon.com/ec2/instance-types/m5/ for details.
+
+config TERRAFORM_AWS_INSTANCE_M5AD_XLARGE
+	bool "m5ad.xlarge"
+	depends on TARGET_ARCH_X86_64
+	help
+	  16 GiB RAM, 4 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps
+	  network speed, and one 150 GiB NVMe drive.
+
+	  Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
+	  option and adjusting the size and number of additional devices.
+
+	  See https://aws.amazon.com/ec2/instance-types/m5/ for details.
+
 config TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	bool "m5ad.2xlarge"
 	depends on TARGET_ARCH_X86_64
 	help
-	  32 GiB RAM, 8 vcpus, 1 10 GiB main drive, and one additional
-	  300 GiB NVMe drive.
+	  32 GiB RAM, 8 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps
+	  network speed, and one 300 GiB NVMe drive.
+
+	  Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
+	  option and adjusting the size and number of additional devices.
+
+	  See https://aws.amazon.com/ec2/instance-types/m5/ for details.
 
 config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	bool "m5ad.4xlarge"
 	depends on TARGET_ARCH_X86_64
 	help
-	  64 GiB RAM, 16 vcpus, 1 10 GiB main drive, and two additional
-	  300 GiB NVMe drives.
+	  64 GiB RAM, 16 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps
+	  and two 300 GiB NVMe drives.
+
+	  Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
+	  option and adjusting the size and number of additional devices.
+
+	  See https://aws.amazon.com/ec2/instance-types/m5/ for details.
 
 config TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM
 	bool "is4gen.medium"
@@ -376,6 +410,8 @@  endchoice
 
 config TERRAFORM_AWS_INSTANCE_TYPE
 	string
+	default "m5ad.large" if TERRAFORM_AWS_INSTANCE_M5AD_LARGE
+	default "m5ad.xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_XLARGE
 	default "m5ad.2xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
 	default "m5ad.4xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "is4gen.medium" if TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM