wip

Author: mrlockstar

infrastructure/terraform/hub/virtual_desktop.tf

@@ -47,43 +47,14 @@ resource "azurerm_role_assignment" "avd_autoscale_blue_hostpool" {
   principal_type = "ServicePrincipal"
 }
 
-# resource "azurerm_role_assignment" "avd_autoscale_blue" {
-#   for_each = (local.deploy_blue_avd ? var.regions : {})
-
-#   scope                = azurerm_resource_group.avd_blue[each.key].id
-#   role_definition_name = "Desktop Virtualization Contributor"
-
-#   # Azure Virtual Desktop autoscale service principal (Microsoft-managed)
-#   principal_id         = local.principal_id
-# }
-
-# resource "azurerm_role_assignment" "avd_autoscale_blue_vm_contributor" {
-#   for_each = (local.deploy_blue_avd ? var.regions : {})
-
-#   scope                = azurerm_resource_group.avd_blue[each.key].id
-#   role_definition_name = "Virtual Machine Contributor"
-
-#   # Azure Virtual Desktop autoscale service principal (Microsoft-managed)
-#   principal_id         = local.principal_id
-# }
-
-# # Assign role to Terraform SP so it can create role assignments
-# resource "azurerm_role_assignment" "terraform_user_access_blue" {
-#   for_each             = (local.deploy_blue_avd ? var.regions : {})
-
-#   scope                = azurerm_resource_group.avd_blue[each.key].id
-#   role_definition_name = "User Access Administrator"
-
-#   principal_id         = local.principal_id
-# }
 
 module "virtual-desktop-blue" {
   for_each = (local.deploy_blue_avd ? var.regions : {})
 
   source = "../../../../dtos-devops-templates/infrastructure/modules/virtual-desktop"
 
   custom_rdp_properties = "drivestoredirect:s:*;audiomode:i:0;videoplaybackmode:i:1;redirectclipboard:i:1;redirectprinters:i:1;devicestoredirect:s:*;redirectcomports:i:1;redirectsmartcards:i:1;usbdevicestoredirect:s:*;enablecredsspsupport:i:1;redirectwebauthn:i:1;use multimon:i:1;enablerdsaadauth:i:1;"
-  computer_name_prefix  = "avd${var.env_type}"
+  computer_name_prefix  = "lung${var.env_type}"
   dag_name              = module.config[each.key].names.avd-dag
   host_pool_name        = module.config[each.key].names.avd-host-pool
   location              = each.key
@@ -138,25 +109,6 @@ resource "azurerm_resource_group" "avd_green" {
   location = each.key
 }
 
-# resource "azurerm_role_assignment" "avd_autoscale_green" {
-#   for_each = (local.deploy_green_avd ? var.regions : {})
-
-#   scope                = azurerm_resource_group.avd_green[each.key].id
-#   role_definition_name = "Desktop Virtualization Contributor"
-
-#   principal_id         = local.principal_id
-# }
-
-# # Assign role to Terraform SP so it can create role assignments
-# resource "azurerm_role_assignment" "terraform_user_access_green" {
-#   for_each             = (local.deploy_green_avd ? var.regions : {})
-
-#   scope                = azurerm_resource_group.avd_green[each.key].id
-#   role_definition_name = "User Access Administrator"
-#   principal_id         = local.principal_id
-# }
-
-
 
 # Green AVD deployment
 module "virtual-desktop-green" {
@@ -165,7 +117,7 @@ module "virtual-desktop-green" {
   source = "../../../../dtos-devops-templates/infrastructure/modules/virtual-desktop"
 
   custom_rdp_properties = "drivestoredirect:s:*;audiomode:i:0;videoplaybackmode:i:1;redirectclipboard:i:1;redirectprinters:i:1;devicestoredirect:s:*;redirectcomports:i:1;redirectsmartcards:i:1;usbdevicestoredirect:s:*;enablecredsspsupport:i:1;redirectwebauthn:i:1;use multimon:i:1;enablerdsaadauth:i:1;"
-  computer_name_prefix  = "av4${var.env_type}"
+  computer_name_prefix  = "lung${var.env_type}"
   dag_name              = module.config[each.key].names.avd-dag
   host_pool_name        = "${module.config[each.key].names.avd-host-pool}-v2"
   location              = each.key