diff mbox series

[v1,02/13] terraform/Azure: Remove managed_disk_type selection

Message ID 20250310141813.969325-3-cel@kernel.org (mailing list archive)
State New
Headers show
Series Block device provisioning for storage nodes | expand

Commit Message

Chuck Lever March 10, 2025, 2:18 p.m. UTC 
From: Chuck Lever <chuck.lever@oracle.com>

Using anything but "Premium_LRS" does not seem sensible, so remove
the choice from Kconfig to keep things simple.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/gen_tfvars/defaults/main.yml    |  1 -
 .../templates/azure/terraform.tfvars.j2         |  1 -
 scripts/terraform.Makefile                      |  1 -
 terraform/azure/Kconfig                         | 17 -----------------
 terraform/azure/main.tf                         |  6 +++---
 terraform/azure/vars.tf                         |  5 -----
 6 files changed, 3 insertions(+), 28 deletions(-)
diff mbox series

Patch

diff --git a/playbooks/roles/gen_tfvars/defaults/main.yml b/playbooks/roles/gen_tfvars/defaults/main.yml
index 8d13e04bd33a..c14ff59c90df 100644
--- a/playbooks/roles/gen_tfvars/defaults/main.yml
+++ b/playbooks/roles/gen_tfvars/defaults/main.yml
@@ -30,7 +30,6 @@  terraform_aws_ebs_volume_size: 0
 
 terraform_azure_resource_location: "invalid"
 terraform_azure_vm_size: "invalid"
-terraform_azure_managed_disk_type: "invalid"
 terraform_azure_image_publisher: "invalid"
 terraform_azure_image_offer: "invalid"
 terraform_azure_image_sku: "invalid"
diff --git a/playbooks/roles/gen_tfvars/templates/azure/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/azure/terraform.tfvars.j2
index 278101cf4cb1..37db35d2cbed 100644
--- a/playbooks/roles/gen_tfvars/templates/azure/terraform.tfvars.j2
+++ b/playbooks/roles/gen_tfvars/templates/azure/terraform.tfvars.j2
@@ -6,7 +6,6 @@  tenant_id = "{{ terraform_azure_tenant_id }}"
 
 resource_location = "{{ terraform_azure_resource_location }}"
 vmsize = "{{ terraform_azure_vm_size }}"
-managed_disk_type = "{{ terraform_azure_managed_disk_type }}"
 image_publisher = "{{ terraform_azure_image_publisher }}"
 image_offer = "{{ terraform_azure_image_offer }}"
 image_sku = "{{ terraform_azure_image_sku }}"
diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index 6543da89a17f..19c2384fb2ad 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -66,7 +66,6 @@  endif
 ifeq (y,$(CONFIG_TERRAFORM_AZURE))
 TERRAFORM_EXTRA_VARS += terraform_azure_resource_location=$(subst ",,$(CONFIG_TERRAFORM_AZURE_RESOURCE_LOCATION))
 TERRAFORM_EXTRA_VARS += terraform_azure_vm_size=$(subst ",,$(CONFIG_TERRAFORM_AZURE_VM_SIZE))
-TERRAFORM_EXTRA_VARS += terraform_azure_managed_disk_type=$(subst ",,$(CONFIG_TERRAFORM_AZURE_MANAGED_DISK_TYPE))
 TERRAFORM_EXTRA_VARS += terraform_azure_image_publisher=$(subst ",,$(CONFIG_TERRAFORM_AZURE_IMAGE_PUBLISHER))
 TERRAFORM_EXTRA_VARS += terraform_azure_image_offer=$(subst ",,$(CONFIG_TERRAFORM_AZURE_IMAGE_OFFER))
 TERRAFORM_EXTRA_VARS += terraform_azure_image_sku=$(subst ",,$(CONFIG_TERRAFORM_AZURE_IMAGE_SKU))
diff --git a/terraform/azure/Kconfig b/terraform/azure/Kconfig
index 30acefd301db..0c5a0df9fbc5 100644
--- a/terraform/azure/Kconfig
+++ b/terraform/azure/Kconfig
@@ -42,23 +42,6 @@  config TERRAFORM_AZURE_VM_SIZE
 	help
 	  This option will set the azure vm image size.
 
-choice
-	prompt "Azure managed disk type"
-	default TERRAFORM_AZURE_MANAGED_DISK_PREMIUM_LRS
-
-config TERRAFORM_AZURE_MANAGED_DISK_PREMIUM_LRS
-	bool "Premium_LRS"
-	help
-	  This option will set the azure vm image size to Standard_DS1_v2.
-
-endchoice
-
-config TERRAFORM_AZURE_MANAGED_DISK_TYPE
-	string "Azure managed disk type"
-	default "Premium_LRS" if TERRAFORM_AZURE_MANAGED_DISK_PREMIUM_LRS
-	help
-	  This option will set azure managed disk type.
-
 choice
 	prompt "Azure image publisher"
 	default TERRAFORM_AZURE_IMAGE_PUBLISHER_DEBIAN
diff --git a/terraform/azure/main.tf b/terraform/azure/main.tf
index 55c66b458a92..d2e90ff7f7f0 100644
--- a/terraform/azure/main.tf
+++ b/terraform/azure/main.tf
@@ -140,7 +140,7 @@  resource "azurerm_linux_virtual_machine" "kdevops_vm" {
     #name                 = "${format("kdevops-main-disk-%s", element(azurerm_virtual_machine.kdevops_vm.*.name, count.index))}"
     name                 = format("kdevops-main-disk-%02d", count.index + 1)
     caching              = "ReadWrite"
-    storage_account_type = var.managed_disk_type
+    storage_account_type = "Premium_LRS"
     #disk_size_gb         = 64
   }
 
@@ -174,7 +174,7 @@  resource "azurerm_managed_disk" "kdevops_data_disk" {
   location             = var.resource_location
   resource_group_name  = azurerm_resource_group.kdevops_group.name
   create_option        = "Empty"
-  storage_account_type = var.managed_disk_type
+  storage_account_type = "Premium_LRS"
   disk_size_gb         = 100
 }
 
@@ -193,7 +193,7 @@  resource "azurerm_managed_disk" "kdevops_scratch_disk" {
   location             = var.resource_location
   resource_group_name  = azurerm_resource_group.kdevops_group.name
   create_option        = "Empty"
-  storage_account_type = var.managed_disk_type
+  storage_account_type = "Premium_LRS"
   disk_size_gb         = 100
 }
 
diff --git a/terraform/azure/vars.tf b/terraform/azure/vars.tf
index 0a7f9585f66b..3981ccb01faf 100644
--- a/terraform/azure/vars.tf
+++ b/terraform/azure/vars.tf
@@ -40,11 +40,6 @@  variable "vmsize" {
   default     = "Standard_DS3_v2"
 }
 
-variable "managed_disk_type" {
-  description = "Managed disk type"
-  default     = "Premium_LRS"
-}
-
 variable "image_publisher" {
   description = "Storage image publisher"
   default     = "Debian"