Merge pull request #36 from ARPA-H/Azure-main2

Azure main2
ARPA-H · Aug 26, 2024 · 53e6847 · 53e6847
2 parents 65c8cb3 + 16e07e5
commit 53e6847
Show file tree

Hide file tree

Showing 13 changed files with 5,786 additions and 4,793 deletions.
diff --git a/workload/arm/brownfield/deployAppAttachToolsVM.json b/workload/arm/brownfield/deployAppAttachToolsVM.json
diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json
diff --git a/workload/arm/deploy-custom-image.json b/workload/arm/deploy-custom-image.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "5039228173651332863"
+      "templateHash": "1485374130452766027"
     },
     "name": "AVD Accelerator - Baseline Custom Image Deployment",
     "description": "AVD Accelerator - Custom Image Baseline"
@@ -222,7 +222,7 @@
       "type": "bool",
       "defaultValue": true,
       "metadata": {
-        "description": "The image supports accelerated networking.\r\nAccelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance.\r\nThis high-performance path bypasses the host from the data path, which reduces latency, jitter, and CPU utilization for the\r\nmost demanding network workloads on supported VM types.\r\n"
+        "description": "The image supports accelerated networking.\nAccelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance.\nThis high-performance path bypasses the host from the data path, which reduces latency, jitter, and CPU utilization for the\nmost demanding network workloads on supported VM types.\n"
       }
     },
     "imageDefinitionHibernateSupported": {
@@ -1750,7 +1750,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.29.47.4906",
-              "templateHash": "3107782125864811908"
+              "templateHash": "5331758898524883549"
             },
             "name": "Azure Compute Galleries",
             "description": "This module deploys an Azure Compute Gallery (formerly known as Shared Image Gallery).",
@@ -2421,7 +2421,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.29.47.4906",
-                      "templateHash": "1237717735391200924"
+                      "templateHash": "143502805110845685"
                     },
                     "name": "Compute Galleries Image Definitions",
                     "description": "This module deploys an Azure Compute Gallery Image Definition.",
@@ -2599,7 +2599,7 @@
                         "V2"
                       ],
                       "metadata": {
-                        "description": "Optional. The hypervisor generation of the Virtual Machine.\r\n- If this value is not specified, then it is determined by the securityType parameter.\r\n- If the securityType parameter is specified, then the value of hyperVGeneration will be V2, else V1.\r\n"
+                        "description": "Optional. The hypervisor generation of the Virtual Machine.\n- If this value is not specified, then it is determined by the securityType parameter.\n- If the securityType parameter is specified, then the value of hyperVGeneration will be V2, else V1.\n"
                       }
                     },
                     "securityType": {
@@ -2626,7 +2626,7 @@
                       "type": "bool",
                       "defaultValue": true,
                       "metadata": {
-                        "description": "Optional. Specify if the image supports accelerated networking.\r\nAccelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance.\r\nThis high-performance path bypasses the host from the data path, which reduces latency, jitter, and CPU utilization for the most demanding network workloads on supported VM types.\r\n"
+                        "description": "Optional. Specify if the image supports accelerated networking.\nAccelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance.\nThis high-performance path bypasses the host from the data path, which reduces latency, jitter, and CPU utilization for the most demanding network workloads on supported VM types.\n"
                       }
                     },
                     "description": {
@@ -2931,7 +2931,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.29.47.4906",
-              "templateHash": "1237717735391200924"
+              "templateHash": "143502805110845685"
             },
             "name": "Compute Galleries Image Definitions",
             "description": "This module deploys an Azure Compute Gallery Image Definition.",
@@ -3109,7 +3109,7 @@
                 "V2"
               ],
               "metadata": {
-                "description": "Optional. The hypervisor generation of the Virtual Machine.\r\n- If this value is not specified, then it is determined by the securityType parameter.\r\n- If the securityType parameter is specified, then the value of hyperVGeneration will be V2, else V1.\r\n"
+                "description": "Optional. The hypervisor generation of the Virtual Machine.\n- If this value is not specified, then it is determined by the securityType parameter.\n- If the securityType parameter is specified, then the value of hyperVGeneration will be V2, else V1.\n"
               }
             },
             "securityType": {
@@ -3136,7 +3136,7 @@
               "type": "bool",
               "defaultValue": true,
               "metadata": {
-                "description": "Optional. Specify if the image supports accelerated networking.\r\nAccelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance.\r\nThis high-performance path bypasses the host from the data path, which reduces latency, jitter, and CPU utilization for the most demanding network workloads on supported VM types.\r\n"
+                "description": "Optional. Specify if the image supports accelerated networking.\nAccelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance.\nThis high-performance path bypasses the host from the data path, which reduces latency, jitter, and CPU utilization for the most demanding network workloads on supported VM types.\n"
               }
             },
             "description": {

diff --git a/workload/bicep/deploy-baseline-arpah.bicep b/workload/bicep/deploy-baseline-arpah.bicep
@@ -1361,7 +1361,7 @@ module managementVm './modules/storageAzureFiles/.bicep/managementVm.bicep' = if
 }
 
 // FSLogix storage
-module fslogixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if (createAvdFslogixDeployment) {
+module fslogixAzureFilesStorage './modules/storageAzureFiles/deploy-arpah.bicep' = if (createAvdFslogixDeployment) {
     name: 'Storage-FSLogix-${time}'
     params: {
         storagePurpose: 'fslogix'
@@ -1455,7 +1455,6 @@ module msixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if (va
                 ? monitoringDiagnosticSettings.outputs.avdAlaWorkspaceResourceId 
                 : alaExistingWorkspaceResourceId) 
             : ''
-        storageFilePrivateEndpointStaticIp: storageFilePrivateEndpointStaticIp
     }
     dependsOn: [
         fslogixAzureFilesStorage

diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep
@@ -629,7 +629,7 @@ var varMsixStorageSku = zoneRedundantStorage ? '${msixStoragePerformance}_ZRS' :
 var varMgmtVmSpecs = {
   osImage: varMarketPlaceGalleryWindows[managementVmOsImage]
   osDiskType: 'Standard_LRS'
-  mgmtVmSize: 'Standard_B2ms'
+  mgmtVmSize: 'Standard_D2ads_v5'
   enableAcceleratedNetworking: false
   ouPath: avdOuPath
   subnetId: createAvdVnet

diff --git a/workload/bicep/modules/avdManagementPlane/deploy.bicep b/workload/bicep/modules/avdManagementPlane/deploy.bicep
@@ -114,7 +114,7 @@ param time string = utcNow()
 // =========== //
 // Variable declaration //
 // =========== //
-var varApplicaitonGroups = [
+var varApplicationGroups = [
   {
     name: applicationGroupName
     friendlyName: applicationGroupFriendlyNameDesktop
@@ -221,7 +221,7 @@ module hostPool '../../../../avm/1.0.0/res/desktop-virtualization/host-pool/main
 }
 
 // Application groups.
-module applicationGroups '../../../../avm/1.0.0/res/desktop-virtualization/application-group/main.bicep' = [for applicationGroup in varApplicaitonGroups: {
+module applicationGroups '../../../../avm/1.0.0/res/desktop-virtualization/application-group/main.bicep' = [for applicationGroup in varApplicationGroups: {
   scope: resourceGroup('${subscriptionId}', '${serviceObjectsRgName}')
   name: '${applicationGroup.name}-${time}'
   params: {

diff --git a/workload/bicep/modules/avdSessionHosts/deploy.bicep b/workload/bicep/modules/avdSessionHosts/deploy.bicep
@@ -139,9 +139,7 @@ param dataCollectionRuleId string
 var varManagedDisk = empty(diskEncryptionSetResourceId) ? {
     storageAccountType: diskType
 } : {
-    diskEncryptionSet: {
-        id: diskEncryptionSetResourceId
-    }
+    diskEncryptionSetResourceId: diskEncryptionSetResourceId
     storageAccountType: diskType
 }
 var varOsDiskProperties = {

diff --git a/workload/bicep/modules/networking-arpah/deploy.bicep b/workload/bicep/modules/networking-arpah/deploy.bicep
@@ -46,15 +46,15 @@ var varExistingSubnetName = split(existingAvdSubnetResourceId, '/')[10]
 // =========== //
 
 // AVD network security group.
-module networksecurityGroupAvd '../../../../carml/1.3.0/Microsoft.Network/networkSecurityGroups/deploy.bicep' = {
+module networksecurityGroupAvd '../../../../avm/1.0.0/res/network/network-security-group/main.bicep' = {
     scope: resourceGroup('${workloadSubsId}', '${networkObjectsRgName}')
     name: 'nsg-avd-${time}'
     params: {
         name: avdNetworksecurityGroupName
         location: sessionHostLocation
         tags: tags
-        diagnosticWorkspaceId: alaWorkspaceResourceId
-        diagnosticLogCategoriesToEnable: varNetworkSecurityGroupDiagnostic
+        // diagnosticWorkspaceId: alaWorkspaceResourceId
+        // diagnosticLogCategoriesToEnable: varNetworkSecurityGroupDiagnostic
         securityRules: [
             {
                 name: 'AVDServiceTraffic'
@@ -160,7 +160,7 @@ module networksecurityGroupAvd '../../../../carml/1.3.0/Microsoft.Network/networ
 }
 
 // AVD route table if creating a vnet
-module routeTableAvd '../../../../carml/1.3.0/Microsoft.Network/routeTables/deploy.bicep' = {
+module routeTableAvd '../../../../avm/1.0.0/res/network/route-table/main.bicep' = {
     scope: resourceGroup('${workloadSubsId}', '${networkObjectsRgName}')
     name: 'Route-Table-AVD-${time}'
     params: {