terraform/Azure: Use "output yaml" for the EBS volumes per instance setting

Remove the line in terraform.Makefile that sets
"terraform_aws_num_ebs_volumes_per_instance" and just pass it
directly from Kconfig via an "output yaml" directive.

As an additional clean-up, rename the variable to be consistent with
the naming of variables related to EBS volumes.

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

Author: chucklever

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

@@ -5,7 +5,7 @@ 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_num_volumes_per_instance = "{{ terraform_aws_ebs_num_volumes_per_instance }}"
+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 }}"
 {% if terraform_aws_ebs_volume_needs_iops %}

scripts/terraform.Makefile

@@ -50,7 +50,6 @@ 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'
-TERRAFORM_EXTRA_VARS += terraform_aws_ebs_num_volumes_per_instance=$(subst ",,$(CONFIG_TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE))
 TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_size=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_AWS_EBS_VOLUME_SIZE))
 TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_type=$(subst ",,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_TYPE))
 ifeq (y,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_NEEDS_IOPS))

terraform/aws/kconfigs/Kconfig.storage

@@ -7,72 +7,53 @@ if TERRAFORM_AWS_ENABLE_EBS_VOLUMES
 
 choice
 	prompt "Number of EBS volumes"
-	default TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_4
+	default TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_4
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_1
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_1
 	bool "1"
-	help
-	  Use 1 EBS volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_2
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_2
 	bool "2"
-	help
-	  Use 2 EBS volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_3
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_3
 	bool "3"
-	help
-	  Use 3 EBS volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_4
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_4
 	bool "4"
-	help
-	  Use 4 volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_5
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_5
 	bool "5"
-	help
-	  Use 5 volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_6
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_6
 	bool "6"
-	help
-	  Use 6 volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_7
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_7
 	bool "7"
-	help
-	  Use 7 volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_8
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_8
 	bool "8"
-	help
-	  Use 8 EBS volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_9
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_9
 	bool "9"
-	help
-	  Use 9 EBS volumes on instances.
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_10
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_10
 	bool "10"
-	help
-	  Use 10 EBS volumes on instances.
 
 endchoice
 
-config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE
+config TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE
 	int
-	default 1 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_1
-	default 2 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_2
-	default 3 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_3
-	default 4 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_4
-	default 5 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_5
-	default 6 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_6
-	default 7 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_7
-	default 8 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_8
-	default 9 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_9
-	default 10 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_10
+	output yaml
+	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
+	default 4 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_4
+	default 5 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_5
+	default 6 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_6
+	default 7 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_7
+	default 8 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_8
+	default 9 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_9
+	default 10 if TERRAFORM_AWS_EBS_VOLUMES_PER_INSTANCE_10
 
 choice
 	prompt "Device type for all EBS volumes"

terraform/aws/main.tf

@@ -142,7 +142,7 @@ module "kdevops_ebs_volumes" {
   count                 = var.aws_enable_ebs == "true" ? local.kdevops_num_boxes : 0
   source                = "./kdevops_ebs_volumes"
   vol_availability_zone = var.aws_availability_zone
-  vol_count             = var.aws_ebs_num_volumes_per_instance
+  vol_count             = var.aws_ebs_volumes_per_instance
   vol_instance_id       = element(aws_instance.kdevops_instance.*.id, count.index)
   vol_iops              = var.aws_ebs_volume_iops
   vol_size              = var.aws_ebs_volume_size

terraform/aws/vars.tf

@@ -60,9 +60,9 @@ variable "aws_enable_ebs" {
   type        = string
 }
 
-variable "aws_ebs_num_volumes_per_instance" {
+variable "aws_ebs_volumes_per_instance" {
   description = "Number of EBS volumes to create per instance"
-  type        = string
+  type        = number
 }
 
 # The t2.micro comes with 8 GiB of storage.