terraform/Azure: Enable selecting the disk performance tier

Allow kdevops users to select improved disk performance.

https://learn.microsoft.com/en-us/azure/virtual-machines/disks-change-performance

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

Author: chucklever

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

@@ -7,6 +7,7 @@ azure_image_sku = "{{ terraform_azure_image_sku }}"
 
 azure_managed_disks_per_instance = {{ terraform_azure_managed_disks_per_instance }}
 azure_managed_disks_size = {{ terraform_azure_managed_disks_size }}
+azure_managed_disks_tier = "{{ terraform_azure_managed_disks_tier }}"
 
 ssh_config_pubkey_file = "{{ kdevops_terraform_ssh_config_pubkey_file }}"
 ssh_config_user = "{{ kdevops_terraform_ssh_config_user }}"

terraform/azure/kconfigs/Kconfig.storage

@@ -153,6 +153,63 @@ config TERRAFORM_AZURE_MANAGED_DISKS_SIZE
 	default 2048 if TERRAFORM_AZURE_MANAGED_DISKS_SIZE_2048G
 	default 4096 if TERRAFORM_AZURE_MANAGED_DISKS_SIZE_4096G
 
+choice
+	prompt "Performance tier for each managed disk"
+	default TERRAFORM_AZURE_MANAGED_DISKS_TIER_P20
+	help
+	  The performance tier determines the maximum IOPS
+	  and throughput each managed disk can handle.
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P1
+	bool "P1"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P2
+	bool "P2"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P3
+	bool "P3"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P4
+	bool "P4"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P6
+	bool "P6"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P10
+	bool "P10"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P15
+	bool "P15"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P20
+	bool "P20"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P30
+	bool "P30"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P40
+	bool "P40"
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER_P50
+	bool "P50"
+
+endchoice
+
+config TERRAFORM_AZURE_MANAGED_DISKS_TIER
+	string
+	output yaml
+	default "P1" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P1
+	default "P2" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P2
+	default "P3" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P3
+	default "P4" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P4
+	default "P6" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P6
+	default "P10" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P10
+	default "P15" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P15
+	default "P20" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P20
+	default "P30" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P30
+	default "P40" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P40
+	default "P50" if TERRAFORM_AZURE_MANAGED_DISKS_TIER_P50
+
 config TERRAFORM_AZURE_DATA_VOLUME_DEVICE_FILE_NAME
 	string "Device name for the /data file system"
 	default "/dev/disk/azure/scsi1/lun0"

terraform/azure/kdevops_managed_disks/main.tf

@@ -1,12 +1,13 @@
 resource "azurerm_managed_disk" "kdevops_managed_disk" {
-  count                = var.md_disk_count
-
-  name                 = format("kdevops_%s_disk%02d", var.md_virtual_machine_name, count.index + 1)
-  location             = var.md_location
-  resource_group_name  = var.md_resource_group_name
-  create_option        = "Empty"
-  storage_account_type = "Premium_LRS"
-  disk_size_gb         = var.md_disk_size
+  count                         = var.md_disk_count
+  create_option                 = "Empty"
+  disk_size_gb                  = var.md_disk_size
+  location                      = var.md_location
+  name                          = format("kdevops_%s_disk%02d", var.md_virtual_machine_name, count.index + 1)
+  public_network_access_enabled = false
+  resource_group_name           = var.md_resource_group_name
+  storage_account_type          = "Premium_LRS"
+  tier                          = var.md_tier
 }
 
 resource "azurerm_virtual_machine_data_disk_attachment" "kdevops_disk_attachment" {

terraform/azure/kdevops_managed_disks/vars.tf

@@ -18,6 +18,11 @@ variable "md_resource_group_name" {
   description = "Azure resource group name"
 }
 
+variable "md_tier" {
+  type        = string
+  description = "Performance tier of managed disks"
+}
+
 variable "md_virtual_machine_id" {
   type        = string
   description = "Azure ID of the virtual machine to attach the disks to"

terraform/azure/main.tf

@@ -144,6 +144,7 @@ module "kdevops_managed_disks" {
   md_disk_count           = var.azure_managed_disks_per_instance
   md_location             = var.azure_location
   md_resource_group_name  = azurerm_resource_group.kdevops_group.name
+  md_tier                 = var.azure_managed_disks_tier
   md_virtual_machine_id   = element(azurerm_linux_virtual_machine.kdevops_vm.*.id, count.index)
   md_virtual_machine_name = element(azurerm_linux_virtual_machine.kdevops_vm.*.name, count.index)
   source                  = "./kdevops_managed_disks"

terraform/azure/vars.tf

@@ -28,6 +28,11 @@ variable "azure_managed_disks_size" {
   type        = number
 }
 
+variable "azure_managed_disks_tier" {
+  description = "Performance tier of managed disks"
+  type        = string
+}
+
 variable "azure_subscription_id" {
   description = "Your Azure subscription ID"
   type        = string