terraform/AWS: Make the EBS volume type selectable

We can get better throughput with the newer device types, helping
tests run to completion more quickly.

The default is left at gp2, which is free in many configurations.

The "io1" and "io2" types can be added as well, but they require
additional aws_ebs_volume attributes (iops, for example), and do
not support volume size smaller than 4GiB. (ie, there is a little
more complexity).

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

Author: chucklever

playbooks/roles/gen_tfvars/defaults/main.yml

@@ -27,6 +27,7 @@ terraform_aws_instance_type: "invalid"
 terraform_aws_enable_ebs: False
 terraform_aws_ebs_num_volumes_per_instance: 0
 terraform_aws_ebs_volume_size: 0
+terraform_aws_ebs_volume_type: "invalid"
 
 terraform_azure_resource_location: "invalid"
 terraform_azure_vm_size: "invalid"

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

@@ -8,6 +8,7 @@ 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_volume_size = "{{ terraform_aws_ebs_volume_size }}"
+aws_ebs_volume_type = "{{ terraform_aws_ebs_volume_type }}"
 
 ssh_config_pubkey_file = "{{ kdevops_terraform_ssh_config_pubkey_file }}"
 ssh_config_user = "{{ kdevops_terraform_ssh_config_user }}"

scripts/terraform.Makefile

@@ -59,6 +59,7 @@ 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))
 endif # CONFIG_TERRAFORM_AWS_ENABLE_EBS_VOLUMES
 
 endif

terraform/aws/Kconfig

@@ -687,6 +687,29 @@ config TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE
 	default 9 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_9
 	default 10 if TERRAFORM_AWS_EBS_NUM_VOLUMES_PER_INSTANCE_10
 
+choice
+	prompt "Type for all EBS volumes"
+	default TERRAFORM_AWS_EBS_VOLUME_TYPE_GP2
+
+config TERRAFORM_AWS_EBS_VOLUME_TYPE_GP2
+	bool "gp2"
+	help
+	  All extra EBS volumes are "General Purpose SSD volumes",
+	  version 2.
+
+config TERRAFORM_AWS_EBS_VOLUME_TYPE_GP3
+	bool "gp3"
+	help
+	  All extra EBS volumes are "General Purpose SSD volumes",
+	  version 3.
+
+endchoice
+
+config TERRAFORM_AWS_EBS_VOLUME_TYPE
+	string
+	default "gp2" if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP2
+	default "gp3" if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP3
+
 choice
 	prompt "Volume size to for all EBS volumes"
 	default TERRAFORM_AWS_EBS_VOLUME_SIZE_32G

terraform/aws/main.tf

@@ -145,7 +145,8 @@ resource "aws_instance" "kdevops_instance" {
 resource "aws_ebs_volume" "kdevops_vols" {
   count             = var.aws_enable_ebs == "true" ? local.kdevops_num_boxes * var.aws_ebs_num_volumes_per_instance : 0
   availability_zone = var.aws_availability_region
-  size = var.aws_ebs_volume_size
+  size              = var.aws_ebs_volume_size
+  type              = var.aws_ebs_volume_type
 }
 
 resource "aws_volume_attachment" "kdevops_att" {

terraform/aws/vars.tf

@@ -104,6 +104,11 @@ variable "aws_ebs_volume_size" {
   default     = "4"
 }
 
+variable "aws_ebs_volume_type" {
+  description = "Type of each of the EBS volumes"
+  default     = "gp2"
+}
+
 # We had to use this as aws terraform provider doesn't have a way to set
 # the hostname. local-exec works too, but this is what we went with.
 variable "user_data_enabled" {