terraform/GCE: Provision a set of extra disks

Instead of setting up two scratch disks, provision a group of extra
attached disks (up to 10), just as the other kdevops providers do.

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

Author: chucklever

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

@@ -7,7 +7,15 @@ gce_image_project = "{{ terraform_gce_image_project }}"
 gce_image_family = "{{ terraform_gce_image_family }}"
 gce_image_size = "{{ terraform_gce_image_size }}"
 gce_image_type = "{{ terraform_gce_image_type }}"
-scratch_disk_interface = "{{ terraform_gce_scatch_disk_type }}"
+gce_disk_count = {{ terraform_gce_disk_count }}
+gce_disk_size = {{ terraform_gce_disk_size }}
+gce_disk_type = "{{ terraform_gce_disk_type }}"
+{% if terraform_gce_disk_iops is defined %}
+gce_disk_iops = {{ terraform_gce_disk_iops }}
+{% endif %}
+{% if terraform_gce_disk_throughput is defined %}
+gce_disk_throughput = {{ terraform_gce_disk_throughput }}
+{% endif %}
 
 ssh_config_pubkey_file = "{{ kdevops_terraform_ssh_config_pubkey_file }}"
 ssh_config_user = "{{ kdevops_terraform_ssh_config_user }}"

scripts/terraform.Makefile

@@ -85,10 +85,6 @@ TERRAFORM_EXTRA_VARS += terraform_azure_subscription_id=$(subst ",,$(CONFIG_TERR
 TERRAFORM_EXTRA_VARS += terraform_azure_tenant_id=$(subst ",,$(CONFIG_TERRAFORM_AZURE_TENANT_ID))
 endif
 
-ifeq (y,$(CONFIG_TERRAFORM_GCE))
-TERRAFORM_EXTRA_VARS += terraform_gce_scatch_disk_type=$(subst ",,$(CONFIG_TERRAFORM_GCE_SCRATCH_DISK_INTERFACE))
-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/gce/kconfigs/Kconfig.storage

@@ -1,11 +1,211 @@
-config TERRAFORM_GCE_SCRATCH_DISK_INTERFACE
-	string "GCE scratch disk interface to use"
-	default "NVME"
+choice
+	prompt "Count of attached disks per instance"
+	default TERRAFORM_GCE_DISK_COUNT_2
+
+config TERRAFORM_GCE_DISK_COUNT_0
+	bool "No persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_1
+	bool "1 persistent disk"
+
+config TERRAFORM_GCE_DISK_COUNT_2
+	bool "2 persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_3
+	bool "3 persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_4
+	bool "4 persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_5
+	bool "5 persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_6
+	bool "6 persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_7
+	bool "7 persistent disks"
+
+config TERRAFORM_GCE_DISK_COUNT_8
+	bool "8 persistent disks"
+
+endchoice
+
+config TERRAFORM_GCE_DISK_COUNT
+	int
+	output yaml
+	default 0 if TERRAFORM_GCE_DISK_COUNT_0
+	default 1 if TERRAFORM_GCE_DISK_COUNT_1
+	default 2 if TERRAFORM_GCE_DISK_COUNT_2
+	default 3 if TERRAFORM_GCE_DISK_COUNT_3
+	default 4 if TERRAFORM_GCE_DISK_COUNT_4
+	default 5 if TERRAFORM_GCE_DISK_COUNT_5
+	default 6 if TERRAFORM_GCE_DISK_COUNT_6
+	default 7 if TERRAFORM_GCE_DISK_COUNT_7
+	default 8 if TERRAFORM_GCE_DISK_COUNT_8
+
+config TERRAFORM_GCE_DISK_NEEDS_IOPS
+	bool
+	default n
+
+config TERRAFORM_GCE_DISK_NEEDS_THROUGHPUT
+	bool
+	default n
+
+choice
+	prompt "Performance class of attached disks"
+	default TERRAFORM_GCE_DISK_TYPE_PD_BALANCED
+	help
+	  Select the type of disk that is attached to your
+	  instances. Note: A performance class selection might not
+	  be supported by all machine families.
+
+config TERRAFORM_GCE_DISK_TYPE_PD_BALANCED
+	bool "Balanced Persistent Disk"
+	help
+	  For most VM shapes, except very large ones, these disks
+	  have the same maximum IOPS as SSD Persistent Disk and
+	  lower IOPS per GiB. This disk type offers performance
+	  levels suitable for most general-purpose applications
+	  at a price point between that of standard and performance
+	  (pd-ssd) Persistent Disk.
+
+	  Backed by solid-state drives (SSD).
+
+config TERRAFORM_GCE_DISK_TYPE_PD_SSD
+	bool "Performance Persistent Disk"
+	help
+	  Suitable for enterprise applications and high-performance
+	  databases that require lower latency and more IOPS than
+	  standard Persistent Disk provides.
+
+	  Backed by solid-state drives (SSD).
+
+config TERRAFORM_GCE_DISK_TYPE_PD_STANDARD
+	bool "Standard Persistent Disk"
+	help
+	  Suitable for large data processing workloads that primarily
+	  use sequential I/Os.
+
+	  Backed by standard hard disk drives (HDD).
+
+config TERRAFORM_GCE_DISK_TYPE_PD_EXTREME
+	bool "Extreme Persistent Disk"
+	select TERRAFORM_GCE_DISK_NEEDS_IOPS
 	help
-	  This option will set GCE scratch disk interface.
+	  Offers consistently high performance for both random
+	  access workloads and bulk throughput. Designed for
+	  high-end database workloads.
+
+	  Backed by solid-state drives (SSD).
+
+config TERRAFORM_GCE_DISK_TYPE_HYPERDISK_BALANCED
+	bool "Hyperdisk Balanced"
+	select TERRAFORM_GCE_DISK_NEEDS_IOPS
+	select TERRAFORM_GCE_DISK_NEEDS_THROUGHPUT
+	help
+	  Hyperdisk Balanced is a good fit for a wide range of use
+	  cases such as LOB applications, web applications, and
+	  medium-tier databases that don't require the performance
+	  of Hyperdisk Extreme.
+
+config TERRAFORM_GCE_DISK_TYPE_HYPERDISK_EXTREME
+	bool "Hyperdisk Extreme"
+	select TERRAFORM_GCE_DISK_NEEDS_IOPS
+	select TERRAFORM_GCE_DISK_NEEDS_THROUGHPUT
+	help
+	  Use Hyperdisk Extreme if Extreme Persistent Disk isn't
+	  supported or doesn't provide enough performance. Hyperdisk
+	  Extreme disks feature higher maximum IOPS and throughput
+	  along with low sub-millisecond latencies, and offer high
+	  performance for the most demanding workloads, such as high
+	  performance databases.
+
+config TERRAFORM_GCE_DISK_TYPE_HYPERDISK_THROUGHPUT
+	bool "Hyperdisk Throughput"
+	help
+	  For scale-out analytics workloads like Hadoop and Kafka,
+	  cold storage, and data drives for cost sensitive apps, use
+	  Hyperdisk Throughput.
+
+endchoice
+
+config TERRAFORM_GCE_DISK_TYPE
+	string
+	output yaml
+	default "pd-balanced" if TERRAFORM_GCE_DISK_TYPE_PD_BALANCED
+	default "pd-ssd" if TERRAFORM_GCE_DISK_TYPE_PD_SSD
+	default "pd-standard" if TERRAFORM_GCE_DISK_TYPE_PD_STANDARD
+	default "pd-extreme" if TERRAFORM_GCE_DISK_TYPE_PD_EXTREME
+	default "hyperdisk-balanced" if TERRAFORM_GCE_DISK_TYPE_HYPERDISK_BALANCED
+	default "hyperdisk-extreme" if TERRAFORM_GCE_DISK_TYPE_HYPERDISK_EXTREME
+	default "hyperdisk-throughput" if TERRAFORM_GCE_DISK_TYPE_HYPERDISK_THROUGHPUT
+
+choice
+	prompt "Size of each attached disk, in GB"
+	default TERRAFORM_GCE_DISK_SIZE_128GB
+
+config TERRAFORM_GCE_DISK_SIZE_8GB
+	bool "8 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_16GB
+	bool "16 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_32GB
+	bool "32 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_64GB
+	bool "64 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_128GB
+	bool "128 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_256GB
+	bool "256 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_512GB
+	bool "512 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_1024GB
+	bool "1024 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_2048GB
+	bool "2048 GB"
+
+config TERRAFORM_GCE_DISK_SIZE_4096GB
+	bool "4096 GB"
+
+endchoice
+
+config TERRAFORM_GCE_DISK_SIZE
+	int
+	output yaml
+	default 8 if TERRAFORM_GCE_DISK_SIZE_8GB
+	default 16 if TERRAFORM_GCE_DISK_SIZE_16GB
+	default 32 if TERRAFORM_GCE_DISK_SIZE_32GB
+	default 64 if TERRAFORM_GCE_DISK_SIZE_64GB
+	default 128 if TERRAFORM_GCE_DISK_SIZE_128GB
+	default 256 if TERRAFORM_GCE_DISK_SIZE_256GB
+	default 512 if TERRAFORM_GCE_DISK_SIZE_512GB
+	default 1024 if TERRAFORM_GCE_DISK_SIZE_1024GB
+	default 2048 if TERRAFORM_GCE_DISK_SIZE_2048GB
+	default 4096 if TERRAFORM_GCE_DISK_SIZE_4096GB
+
+config TERRAFORM_GCE_DISK_IOPS
+	int "Provisioned IOPS for each attached disk"
+	output yaml
+	range 125 120000
+	default 240
+	depends on TERRAFORM_GCE_DISK_NEEDS_IOPS
 
-	  Documentation: https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance#scratch_disk
+config TERRAFORM_GCE_DISK_THROUGHPUT
+	int "Provisioned throughput for each attached disk"
+	output yaml
+	range 125 600
+	default 240
+	depends on TERRAFORM_GCE_DISK_NEEDS_THROUGHPUT
 
 config TERRAFORM_GCE_DATA_VOLUME_DEVICE_FILE_NAME
 	string
-	default "/dev/nvme0n1"
+	output yaml
+	default "/dev/disk/by-id/google-persistent-disk-1"

terraform/gce/kdevops_compute_disks/main.tf

@@ -0,0 +1,15 @@
+resource "google_compute_disk" "kdevops_disk" {
+  count                  = var.cd_disk_count
+  name                   = format("disk-%s-%02d", var.cd_instance_name, count.index)
+  provisioned_iops       = var.cd_disk_iops
+  provisioned_throughput = var.cd_disk_throughput
+  type                   = var.cd_disk_type
+  size                   = var.cd_disk_size
+  zone                   = var.cd_zone
+}
+
+resource "google_compute_attached_disk" "kdevops_attached_disk" {
+  count    = var.cd_disk_count
+  disk     = google_compute_disk.kdevops_disk[count.index].id
+  instance = var.cd_instance_id
+}

terraform/gce/kdevops_compute_disks/vars.tf

@@ -0,0 +1,39 @@
+variable "cd_disk_count" {
+  description = "Count of attached disks per instance"
+  type        = number
+}
+
+variable "cd_disk_iops" {
+  description = "Provisioned IOPS for each attached disk"
+  type        = number
+}
+
+variable "cd_disk_size" {
+  description = "Size of each attached disk, in GB"
+  type        = number
+}
+
+variable "cd_disk_throughput" {
+  description = "Provisioned throughput for each attached disk"
+  type        = number
+}
+
+variable "cd_disk_type" {
+  description = "Performance class of attached disks"
+  type        = string
+}
+
+variable "cd_instance_id" {
+  description = "Instance ID of instance to which to attach disks"
+  type        = string
+}
+
+variable "cd_instance_name" {
+  description = "Instance name of instance to which to attach disks"
+  type        = string
+}
+
+variable "cd_zone" {
+  description = "Availability zone in which disks are to reside"
+  type        = string
+}

terraform/gce/main.tf

@@ -19,14 +19,6 @@ resource "google_compute_instance" "kdevops_instance" {
     }
   }
 
-  scratch_disk {
-    interface = var.scratch_disk_interface
-  }
-
-  scratch_disk {
-    interface = var.scratch_disk_interface
-  }
-
   network_interface {
     network = "default"
 
@@ -35,9 +27,26 @@ resource "google_compute_instance" "kdevops_instance" {
     }
   }
 
+  lifecycle {
+    ignore_changes = [attached_disk]
+  }
+
   metadata = {
     ssh-keys = format("%s:%s", var.ssh_config_user, file(var.ssh_config_pubkey_file))
   }
 
   metadata_startup_script = "echo hi > /test.txt"
 }
+
+module "kdevops_compute_disks" {
+  count              = local.kdevops_num_boxes
+  cd_disk_count      = var.gce_disk_count
+  cd_disk_iops       = var.gce_disk_iops
+  cd_disk_size       = var.gce_disk_size
+  cd_disk_throughput = var.gce_disk_throughput
+  cd_disk_type       = var.gce_disk_type
+  cd_instance_id     = google_compute_instance.kdevops_instance[count.index].id
+  cd_instance_name   = element(var.kdevops_nodes, count.index)
+  cd_zone            = var.gce_zone
+  source             = "./kdevops_compute_disks"
+}

terraform/gce/vars.tf

@@ -3,6 +3,33 @@ variable "gce_credentials" {
   type        = string
 }
 
+variable "gce_disk_count" {
+  description = "Count of attached disks per instance"
+  type        = number
+}
+
+variable "gce_disk_iops" {
+  description = "Provisioned IOPS for each attached disk"
+  type        = number
+  default     = null
+}
+
+variable "gce_disk_size" {
+  description = "Size of each attached disk, in GB"
+  type        = number
+}
+
+variable "gce_disk_throughput" {
+  description = "Provisioned throughput for each attached disk"
+  type        = number
+  default     = null
+}
+
+variable "gce_disk_type" {
+  description = "Performance class of attached disks"
+  type        = string
+}
+
 variable "gce_image_family" {
   description = "Release of Linux distribution"
   type        = string
@@ -42,8 +69,3 @@ variable "gce_zone" {
   description = "Availability zone"
   type        = string
 }
-
-variable "scratch_disk_interface" {
-  description = "The type of interface for the scratch disk, SCSI, or NVME"
-  type        = string
-}