From 15c8f9887b967b05ba8a972a8644967333ec63d9 Mon Sep 17 00:00:00 2001 From: james-annages <45330941+james-annages@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:30:00 +0000 Subject: [PATCH] removed the shared storage veriable. --- templates/workspaces/base/parameters.json | 6 ------ templates/workspaces/base/porter.yaml | 4 ---- templates/workspaces/base/terraform/locals.tf | 1 + templates/workspaces/base/terraform/variables.tf | 6 ------ templates/workspaces/base/terraform/workspace.tf | 2 +- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/templates/workspaces/base/parameters.json b/templates/workspaces/base/parameters.json index 3d9896abb0..72f31b874b 100755 --- a/templates/workspaces/base/parameters.json +++ b/templates/workspaces/base/parameters.json @@ -165,12 +165,6 @@ "source": { "env": "ENABLE_BACKUP" } - }, - { - "name": "shared_storage_name", - "source": { - "env": "SHARED_STORAGE_NAME" - } } ] } diff --git a/templates/workspaces/base/porter.yaml b/templates/workspaces/base/porter.yaml index 572317ecea..aa71046d5e 100644 --- a/templates/workspaces/base/porter.yaml +++ b/templates/workspaces/base/porter.yaml @@ -130,10 +130,6 @@ parameters: type: boolean default: true description: "Enable backups for the workspace, including the vm's & shared storage." - - name: shared_storage_name - type: string - default: "vm-shared-storage" - description: "The name of the shared storage used for the workspace VMs" - name: backup_vault_name type: string default: "" diff --git a/templates/workspaces/base/terraform/locals.tf b/templates/workspaces/base/terraform/locals.tf index bc84d98e4d..cdac8356b5 100644 --- a/templates/workspaces/base/terraform/locals.tf +++ b/templates/workspaces/base/terraform/locals.tf @@ -10,4 +10,5 @@ locals { } kv_encryption_key_name = "tre-encryption-${local.workspace_resource_name_suffix}" encryption_identity_name = "id-encryption-${var.tre_id}-${local.short_workspace_id}" + shared_storage_name = "vm-shared-storage" } diff --git a/templates/workspaces/base/terraform/variables.tf b/templates/workspaces/base/terraform/variables.tf index ed928f5c49..545c58d04c 100644 --- a/templates/workspaces/base/terraform/variables.tf +++ b/templates/workspaces/base/terraform/variables.tf @@ -81,12 +81,6 @@ variable "enable_backup"{ description = "Enable backups for the workspace" } -variable "shared_storage_name" { - type = string - default = "vm-shared-storage" - description = "Name of the VM Shared Storage" -} - # These variables are only passed in if you are not registering an AAD # application as they need passing back out variable "app_role_id_workspace_owner" { diff --git a/templates/workspaces/base/terraform/workspace.tf b/templates/workspaces/base/terraform/workspace.tf index 33c763838c..031b9727ed 100644 --- a/templates/workspaces/base/terraform/workspace.tf +++ b/templates/workspaces/base/terraform/workspace.tf @@ -103,7 +103,7 @@ module "backup" { azurerm_storage_account_id = azurerm_storage_account.stg.id enable_local_debugging = var.enable_local_debugging enable_cmk_encryption = var.enable_cmk_encryption - shared_storage_name = var.shared_storage_name + shared_storage_name = local.shared_storage_name depends_on = [