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

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

We can also remove NEEDS_IOPS and simply detect whether the output
variable was defined or not when building the terraform.tfvars file.

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

Author: chucklever

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

@@ -8,7 +8,7 @@ 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 }}"
-{% if terraform_aws_ebs_volume_needs_iops %}
+{% if terraform_aws_ebs_volume_iops is defined %}
 aws_ebs_volume_iops = {{ terraform_aws_ebs_volume_iops }}
 {% endif %}
 

scripts/terraform.Makefile

@@ -51,12 +51,6 @@ 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))
-ifeq (y,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_NEEDS_IOPS))
-TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_needs_iops=true
-TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_iops=$(subst ",,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_IOPS))
-else
-TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_needs_iops=false
-endif
 endif # CONFIG_TERRAFORM_AWS_ENABLE_EBS_VOLUMES
 
 endif

terraform/aws/kconfigs/Kconfig.storage

@@ -96,22 +96,17 @@ config TERRAFORM_AWS_EBS_VOLUME_TYPE
 	default "io1" if TERRAFORM_AWS_EBS_VOLUME_TYPE_IO1
 	default "io2" if TERRAFORM_AWS_EBS_VOLUME_TYPE_IO2
 
-config TERRAFORM_AWS_EBS_VOLUME_NEEDS_IOPS
-	bool
-	default n if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP2
-	default n if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP3
-	default y if TERRAFORM_AWS_EBS_VOLUME_TYPE_IO1
-	default y if TERRAFORM_AWS_EBS_VOLUME_TYPE_IO2
-
-if TERRAFORM_AWS_EBS_VOLUME_NEEDS_IOPS
+if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP3 || TERRAFORM_AWS_EBS_VOLUME_TYPE_IO1 || TERRAFORM_AWS_EBS_VOLUME_TYPE_IO2
 
 config TERRAFORM_AWS_EBS_VOLUME_IOPS
 	int "IOPS provisioned for EBS volumes"
+	output yaml
+	default 3000
 	help
 	  This setting specifies the IOPS to be provisioned for each
 	  extra EBS volume.
 
-endif
+endif # TERRAFORM_AWS_EBS_VOLUME_TYPE_GP3 || TERRAFORM_AWS_EBS_ ...
 
 choice
 	prompt "Volume size for all EBS volumes"