From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18EEA2236E4 for ; Mon, 10 Mar 2025 14:18:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741616299; cv=none; b=iUDcrExOTewKOInFdPXu/b2cls38jOk2F0VKpyDbmKW7rFoCZ6IklIWAIvQmCe3hHVpHf25Sq1ByVJFsS3vFqc3eYE8Rez4G+PvkvVUa35Ip+qcUELqdgkptDGgYlojyf6ivSWH93iavBr9fcg2ryinNKbJ0nNQpLTms8EddqzU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741616299; c=relaxed/simple; bh=g9o9fM5HJMV6ARCFE1NekH9xbuYop5A3A+XZBUuQaYg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NXCIbdQLmn6W7hgeW9esNxbk76HIKhYJ3VIgsjBxsCX8b5/oV29V3DvbfnoGP6kDN9SpC/5CCoPdm/pEtP6sWV6iC1RybILXCGlYCA2ct6zVaWbdpbV9ctRhmDCefCjdx6QhP/8JO/klqi+pZogc+hGZ7rhoHa9i/wOZ19uHb3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LRJETbeG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LRJETbeG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FBCEC4CEEE; Mon, 10 Mar 2025 14:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741616297; bh=g9o9fM5HJMV6ARCFE1NekH9xbuYop5A3A+XZBUuQaYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LRJETbeGiFg16DDOrenIVUQhK9YbSgMbpwHyk8zL9Wqz0W/r91Kqn+X+TCSI/opU5 kEBCjHiYVhi+x6rgk96qdiA2Uqh+cpFM0Pc9L+S6o8XTII8Ok0bD+xfaAEeDmRosXz rMaLjRBdgyz0QkBDq/fDEwPVIrJPyJ+1nWrc6zJ9tf3dfKs9Yhye352xyzMFxNi0mO CaiIi55g1hfBIi/j4s7wADH5ZnQZOGghLYH9iQZ/43/HhhsATArO186bSBPb83YREt SM8KgkDySO5u0VIB3701i+glGseLCtLvBnQ5UFEBqEXJYsIWYVKZlGphBqp32mdHcY jtTB8q2is8XaA== From: cel@kernel.org To: Luis Chamberlain , Chandan Babu R , Jeff Layton Cc: , Chuck Lever Subject: [PATCH v1 02/13] terraform/Azure: Remove managed_disk_type selection Date: Mon, 10 Mar 2025 10:18:02 -0400 Message-ID: <20250310141813.969325-3-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310141813.969325-1-cel@kernel.org> References: <20250310141813.969325-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Using anything but "Premium_LRS" does not seem sensible, so remove the choice from Kconfig to keep things simple. Signed-off-by: Chuck Lever --- 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 --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" -- 2.48.1