terraform/AWS: Remove terraform_aws_enable_ebs_volumes

Setting the "volumes per instance" value is already what the
scripting does underneath Kconfig. It's less complex to expose
that setting to Kconfig users and get rid of "Enable EBS".

Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

playbooks/roles/gen_tfvars/defaults/main.yml

@@ -17,8 +17,6 @@ terraform_private_net_enabled: "false"
 terraform_private_net_prefix: ""
 terraform_private_net_mask: 0
 
-terraform_aws_enable_ebs: False
-
 terraform_oci_region: "invalid"
 terraform_oci_tenancy_ocid: "invalid"
 terraform_oci_user_ocid: "invalid"

playbooks/roles/gen_tfvars/templates/aws/terraform.tfvars.j2

@@ -4,7 +4,6 @@ aws_availability_zone = "{{ terraform_aws_av_zone }}"
 aws_name_search = "{{ terraform_aws_ns }}"
 aws_ami_owner = "{{ terraform_aws_ami_owner }}"
 aws_instance_type = "{{ terraform_aws_instance_type }}"
-aws_enable_ebs = "{{ terraform_aws_enable_ebs | lower }}"
 aws_ebs_volumes_per_instance = "{{ terraform_aws_ebs_volumes_per_instance }}"
 aws_ebs_volume_size = {{ terraform_aws_ebs_volume_size }}
 aws_ebs_volume_type = "{{ terraform_aws_ebs_volume_type }}"

scripts/terraform.Makefile

@@ -47,13 +47,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
 
 DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
 
-ifeq (y,$(CONFIG_TERRAFORM_AWS))
-ifeq (y,$(CONFIG_TERRAFORM_AWS_ENABLE_EBS_VOLUMES))
-TERRAFORM_EXTRA_VARS += terraform_aws_enable_ebs='True'
-endif # CONFIG_TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-
-endif
-
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
 TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION))
 TERRAFORM_EXTRA_VARS += terraform_oci_tenancy_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_TENANCY_OCID))

terraform/aws/kconfigs/Kconfig.storage

@@ -1,14 +1,10 @@
-config TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-	bool "Enable EBS volumes"
-	help
-	  Enable this to enable EBS volumes.
-
-if TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-
 choice
 	prompt "Number of EBS volumes"
 	default TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_4
 
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_0
+	bool "0"
+
 config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_1
 	bool "1"
 
@@ -44,6 +40,7 @@ endchoice
 config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE
 	int
 	output yaml
+	default 0 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_0
 	default 1 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_1
 	default 2 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_2
 	default 3 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_3
@@ -190,8 +187,6 @@ config TERRAFORM_AWS_EBS_VOLUME_SIZE
 	default 3078 if TERRAFORM_AWS_EBS_VOLUME_SIZE_3078G
 	default 4096 if TERRAFORM_AWS_EBS_VOLUME_SIZE_4096G
 
-endif # TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-
 config TERRAFORM_AWS_DATA_VOLUME_DEVICE_FILE_NAME
 	string
 	default "/dev/nvme1n1"

terraform/aws/kconfigs/instance-types/Kconfig.c7a

@@ -4,8 +4,8 @@ choice
 	prompt "AWS instance size"
 	default TERRAFORM_AWS_INSTANCE_SIZE_C7A_8XLARGE
 	help
-	  Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-	  option and adjusting the size and number of additional devices.
+	  Add storage by increasing the number of EBS volumes per
+	  instance.
 
 config TERRAFORM_AWS_INSTANCE_SIZE_C7A_8XLARGE
 	bool "c7a.8xlarge"

terraform/aws/kconfigs/instance-types/Kconfig.m5

@@ -4,8 +4,8 @@ choice
 	prompt "AWS instance type"
 	default TERRAFORM_AWS_INSTANCE_SIZE_M5AD_4XLARGE
 	help
-	  Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-	  option and adjusting the size and number of additional devices.
+	  Add storage by increasing the number of EBS volumes per
+	  instance.
 
 config TERRAFORM_AWS_INSTANCE_SIZE_M5AD_LARGE
 	bool "m5ad.large"

terraform/aws/kconfigs/instance-types/Kconfig.m7a

@@ -4,8 +4,8 @@ choice
 	prompt "AWS instance type"
 	default TERRAFORM_AWS_INSTANCE_SIZE_M7A_XLARGE
 	help
-	  Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
-	  option and adjusting the size and number of additional devices.
+	  Add storage by increasing the number of EBS volumes per
+	  instance.
 
 config TERRAFORM_AWS_INSTANCE_SIZE_M7A_MEDIUM
 	bool "m7a.medium"

terraform/aws/main.tf

@@ -139,7 +139,7 @@ resource "aws_instance" "kdevops_instance" {
 }
 
 module "kdevops_ebs_volumes" {
-  count                 = var.aws_enable_ebs == "true" ? local.kdevops_num_boxes : 0
+  count                 = var.aws_ebs_volumes_per_instance > 0 ? local.kdevops_num_boxes : 0
   source                = "./kdevops_ebs_volumes"
   vol_availability_zone = var.aws_availability_zone
   vol_count             = var.aws_ebs_volumes_per_instance

terraform/aws/vars.tf

@@ -55,11 +55,6 @@ variable "aws_instance_type" {
   type        = string
 }
 
-variable "aws_enable_ebs" {
-  description = "Whether or not to enable EBS"
-  type        = string
-}
-
 variable "aws_ebs_volumes_per_instance" {
   description = "Number of EBS volumes to create per instance"
   type        = number