wip

Author: mrlockstar

infrastructure/terraform/hub/data.tf

@@ -1,12 +1,12 @@
 data "azurerm_client_config" "current" {}
 
-data "azuread_group" "avd_users" {
-  display_name = var.avd_users_group_name
-}
+# data "azuread_group" "avd_users" {
+#   display_name = var.avd_users_group_name
+# }
 
-data "azuread_group" "avd_admins" {
-  display_name = var.avd_admins_group_name
-}
+# data "azuread_group" "avd_admins" {
+#   display_name = var.avd_admins_group_name
+# }
 
 # data "azuread_group" "avd_platform_users" {
 #   display_name = "DToS-platform-team-Dev"

infrastructure/terraform/hub/virtual_desktop.tf

@@ -31,35 +31,35 @@ resource "azurerm_resource_group" "avd_blue" {
   location = each.key
 }
 
-resource "azurerm_role_assignment" "avd_autoscale_blue" {
-  for_each = (local.deploy_blue_avd ? var.regions : {})
+# 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"
+#   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
-}
+#   # 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 : {})
 
-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"
 
-  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
+# }
 
-  # 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 : {})
 
-# 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"
 
-  scope                = azurerm_resource_group.avd_blue[each.key].id
-  role_definition_name = "User Access Administrator"
-  principal_id         = local.principal_id
-}
+#   principal_id         = local.principal_id
+# }
 
 module "virtual-desktop-blue" {
   for_each = (local.deploy_blue_avd ? var.regions : {})
@@ -93,13 +93,13 @@ module "virtual-desktop-blue" {
   resource_group_name       = azurerm_resource_group.avd_blue[each.key].name
   resource_group_id         = azurerm_resource_group.avd_blue[each.key].id
   scaling_plan_name         = module.config[each.key].names.avd-scaling-plan
-  source_image_reference = {
-    publisher = "MicrosoftWindowsDesktop"
-    offer     = "windows-11"
-    sku       = "win11-23h2-avd"
-    version   = "latest"
-  }
-  # source_image_id           = var.AVD_SOURCE_IMAGE_ID
+  # source_image_reference = {
+  #   publisher = "MicrosoftWindowsDesktop"
+  #   offer     = "windows-11"
+  #   sku       = "win11-23h2-avd"
+  #   version   = "latest"
+  # }
+  source_image_id           = var.AVD_SOURCE_IMAGE_ID
   # source_image_reference    = var.avd_source_image_reference
   # source_image_from_gallery = var.avd_source_image_from_gallery
   subnet_id                 = module.subnets_hub["${module.config[each.key].names.subnet}-virtual-desktop"].id
@@ -112,9 +112,6 @@ module "virtual-desktop-blue" {
 
   tags = var.tags
 
-  depends_on = [
-    azurerm_role_assignment.avd_autoscale_blue
-  ]
 }
 
 resource "azurerm_resource_group" "avd_green" {
@@ -124,23 +121,23 @@ resource "azurerm_resource_group" "avd_green" {
   location = each.key
 }
 
-resource "azurerm_role_assignment" "avd_autoscale_green" {
-  for_each = (local.deploy_green_avd ? var.regions : {})
+# 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"
+#   scope                = azurerm_resource_group.avd_green[each.key].id
+#   role_definition_name = "Desktop Virtualization Contributor"
 
-  principal_id         = local.principal_id
-}
+#   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 : {})
+# # 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
-}
+#   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" {
@@ -187,9 +184,6 @@ module "virtual-desktop-green" {
 
   tags = var.tags
 
-  depends_on = [
-    azurerm_role_assignment.avd_autoscale_green
-  ]
 }
 
 module "route-table-virtual-desktop" {