wip

Author: mrlockstar

infrastructure/environments/nonlive-hub/variables.tfvars

@@ -46,8 +46,9 @@ private_dns_zones = {
 avd_vm_count                 = 1
 avd_maximum_sessions_allowed = 1 # per session host
 avd_vm_size                  = "Standard_D4as_v5"
-avd_users_group_name         = "DToS-hub-dev-uks-hub-virtual-desktop-User-Login"
-avd_admins_group_name        = "DToS-hub-dev-uks-hub-virtual-desktop-User-ADMIN-Login"
+
+avd_users_group_name         = "screening-lungcs-nonlive-virtual-desktop-user-login"
+avd_admins_group_name        = "screening-lungcs-nonlive-virtual-desktop-admin-login"
 
 avd_source_image_from_gallery = {
   image_name      = "gi_wvd"
@@ -106,31 +107,4 @@ regions = {
       }
     }
   }
-    ukwest = {
-    address_space     = "10.65.0.0/16"
-    is_primary_region = true
-    subnets = {
-      pep = {
-        cidr_newbits = 8
-        cidr_offset  = 2
-      }
-      virtual-desktop = {
-        cidr_newbits = 11
-        cidr_offset  = 32
-      }
-      dns-resolver-in = {
-        cidr_newbits               = 12
-        cidr_offset                = 112
-        delegation_name            = "Microsoft.Network/dnsResolvers"
-        service_delegation_name    = "Microsoft.Network/dnsResolvers"
-        service_delegation_actions = ["Microsoft.Network/virtualNetworks/subnets/join/action"]
-      }
-      firewall = {
-        name         = "AzureFirewallSubnet"
-        cidr_newbits = 10
-        cidr_offset  = 192
-        create_nsg   = false
-      }
-    }
-  }
 }

infrastructure/terraform/hub/data.tf

@@ -8,9 +8,9 @@ data "azuread_group" "avd_admins" {
   display_name = var.avd_admins_group_name
 }
 
-data "azuread_group" "avd_platform_users" {
-  display_name = "DToS-platform-team-Dev"
-}
+# data "azuread_group" "avd_platform_users" {
+#   display_name = "DToS-platform-team-Dev"
+# }
 
 # This client id is the same for all Azure customers - it is not a secret.
 # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/app_service_certificate

infrastructure/terraform/hub/virtual_desktop.tf

@@ -39,17 +39,22 @@ module "virtual-desktop" {
   host_pool_name        = module.config[each.key].names.avd-host-pool
   location              = each.key
 
-  entra_users_group_id = (
-    local.blue_avd_primary
-    ? data.azuread_group.avd_users.id
-    : data.azuread_group.avd_platform_users.id
-  )
+  # entra_users_group_id = (
+  #   local.blue_avd_primary
+  #   ? data.azuread_group.avd_users.id
+  #   : data.azuread_group.avd_users.id
+  # )
 
-  entra_admins_group_id = (
-    local.blue_avd_primary
-    ? data.azuread_group.avd_admins.id
-    : data.azuread_group.avd_platform_users.id
-  )
+  entra_users_group_id = "14fb0025-1031-4f11-b374-837f2b9453c1"
+
+
+  # entra_admins_group_id = (
+  #   local.blue_avd_primary
+  #   ? data.azuread_group.avd_admins.id
+  #   : data.azuread_group.avd_admins.id
+  # )
+
+  entra_admins_group_id = "22f7249-6d90-493a-97f8-137eb9aac9bc"
 
   maximum_sessions_allowed  = var.avd_maximum_sessions_allowed
   resource_group_name       = azurerm_resource_group.avd[each.key].name
@@ -88,17 +93,21 @@ module "virtual-desktop-v2" {
   host_pool_name        = "${module.config[each.key].names.avd-host-pool}-v2"
   location              = each.key
 
-  entra_users_group_id = (
-    local.green_avd_primary
-    ? data.azuread_group.avd_users.id
-    : data.azuread_group.avd_platform_users.id
-  )
+  # entra_users_group_id = (
+  #   local.green_avd_primary
+  #   ? data.azuread_group.avd_users.id
+  #   : data.azuread_group.avd_users.id
+  # )
+
+  entra_users_group_id = "14fb0025-1031-4f11-b374-837f2b9453c1"
+
+  # entra_admins_group_id = (
+  #   local.green_avd_primary
+  #   ? data.azuread_group.avd_admins.id
+  #   : data.azuread_group.avd_admins.id
+  # )
+  entra_admins_group_id = "22f7249-6d90-493a-97f8-137eb9aac9bc"
 
-  entra_admins_group_id = (
-    local.green_avd_primary
-    ? data.azuread_group.avd_admins.id
-    : data.azuread_group.avd_platform_users.id
-  )
   maximum_sessions_allowed  = var.avd_maximum_sessions_allowed
   resource_group_name       = azurerm_resource_group.avd-v2[each.key].name
   resource_group_id         = azurerm_resource_group.avd-v2[each.key].id