terraform/Azure: Use "output yaml" for the EBS volume size setting

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

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

Author: chucklever

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

@@ -6,7 +6,7 @@ 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_size = {{ terraform_aws_ebs_volume_size }}
 aws_ebs_volume_type = "{{ terraform_aws_ebs_volume_type }}"
 {% if terraform_aws_ebs_volume_iops is defined %}
 aws_ebs_volume_iops = {{ terraform_aws_ebs_volume_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_volume_size=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_AWS_EBS_VOLUME_SIZE))
 endif # CONFIG_TERRAFORM_AWS_ENABLE_EBS_VOLUMES
 
 endif

terraform/aws/kconfigs/Kconfig.storage

@@ -174,8 +174,9 @@ config TERRAFORM_AWS_EBS_VOLUME_SIZE_4096G
 
 endchoice
 
-config TERRAFORM_TERRAFORM_AWS_EBS_VOLUME_SIZE
+config TERRAFORM_AWS_EBS_VOLUME_SIZE
 	int
+	output yaml
 	default 4 if TERRAFORM_AWS_EBS_VOLUME_SIZE_4G
 	default 8 if TERRAFORM_AWS_EBS_VOLUME_SIZE_8G
 	default 16 if TERRAFORM_AWS_EBS_VOLUME_SIZE_16G

terraform/aws/vars.tf

@@ -65,14 +65,9 @@ variable "aws_ebs_volumes_per_instance" {
   type        = number
 }
 
-# The t2.micro comes with 8 GiB of storage.
-# For more storage we need to use EBS.
-# AWS Free Tier includes 30GB of Storage, 2 million I/Os, and 1GB of snapshot
-# storage with Amazon Elastic Block Store (EBS).
-#
 variable "aws_ebs_volume_size" {
   description = "Size in GiB for each of the volumes"
-  type        = string
+  type        = number
 }
 
 variable "aws_ebs_volume_type" {