From cdbe1f8f5c150a38a2d30854cfb581c279bcad41 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:19:16 -0500 Subject: [PATCH] updates --- workload/arm/deploy-baseline.json | 9 +++++---- workload/bicep/deploy-baseline.bicep | 2 +- .../avdSessionHosts/.bicep/vmScaleSet.bicep | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json index 6135eddf4..eff411066 100644 --- a/workload/arm/deploy-baseline.json +++ b/workload/arm/deploy-baseline.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.29.47.4906", - "templateHash": "17140296604916437495" + "templateHash": "718139678628774950" }, "name": "AVD Accelerator - Baseline Deployment", "description": "AVD Accelerator - Deployment Baseline", @@ -1608,7 +1608,7 @@ } ], "varMarketPlaceGalleryWindows": "[variables('$fxv#1')]", - "varStorageAzureFilesDscAgentPackageLocation": "https://github.com/Azure/avdaccelerator/raw/main/workload/scripts/DSCStorageScripts/1.0.0/DSCStorageScripts.zip", + "varStorageAzureFilesDscAgentPackageLocation": "https://github.com/Azure/avdaccelerator/raw/main/workload/scripts/DSCStorageScripts/1.0.1/DSCStorageScripts.zip", "varStorageToDomainScriptUri": "[format('{0}scripts/Manual-DSC-Storage-Scripts.ps1', variables('varBaseScriptUri'))]", "varStorageToDomainScript": "./Manual-DSC-Storage-Scripts.ps1", "varOuStgPath": "[if(not(empty(parameters('storageOuPath'))), format('\"{0}\"', parameters('storageOuPath')), format('\"{0}\"', variables('varDefaultStorageOuPath')))]", @@ -30170,7 +30170,7 @@ "_generator": { "name": "bicep", "version": "0.29.47.4906", - "templateHash": "15635298892932140918" + "templateHash": "11757932224469015605" }, "name": "AVD Accelerator - VMSS Flex", "description": "Deploys a VMSS Flex without VM profile", @@ -30228,7 +30228,8 @@ "properties": { "orchestrationMode": "Flexible", "zoneBalance": "[if(parameters('useAvailabilityZones'), true(), false())]", - "platformFaultDomainCount": "[if(parameters('useAvailabilityZones'), 1, parameters('platformFaultDomainCount'))]" + "platformFaultDomainCount": "[if(parameters('useAvailabilityZones'), 1, parameters('platformFaultDomainCount'))]", + "singlePlacementGroup": false }, "tags": "[parameters('tags')]" } diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep index abea6156c..61118dd47 100644 --- a/workload/bicep/deploy-baseline.bicep +++ b/workload/bicep/deploy-baseline.bicep @@ -900,7 +900,7 @@ var varPooledScalingPlanSchedules = [ } ] var varMarketPlaceGalleryWindows = loadJsonContent('../variables/osMarketPlaceImages.json') -var varStorageAzureFilesDscAgentPackageLocation = 'https://github.com/Azure/avdaccelerator/raw/main/workload/scripts/DSCStorageScripts/1.0.0/DSCStorageScripts.zip' +var varStorageAzureFilesDscAgentPackageLocation = 'https://github.com/Azure/avdaccelerator/raw/main/workload/scripts/DSCStorageScripts/1.0.1/DSCStorageScripts.zip' var varStorageToDomainScriptUri = '${varBaseScriptUri}scripts/Manual-DSC-Storage-Scripts.ps1' var varStorageToDomainScript = './Manual-DSC-Storage-Scripts.ps1' var varOuStgPath = !empty(storageOuPath) ? '"${storageOuPath}"' : '"${varDefaultStorageOuPath}"' diff --git a/workload/bicep/modules/avdSessionHosts/.bicep/vmScaleSet.bicep b/workload/bicep/modules/avdSessionHosts/.bicep/vmScaleSet.bicep index 6535c7770..00e79f059 100644 --- a/workload/bicep/modules/avdSessionHosts/.bicep/vmScaleSet.bicep +++ b/workload/bicep/modules/avdSessionHosts/.bicep/vmScaleSet.bicep @@ -44,6 +44,20 @@ resource vmssFlex 'Microsoft.Compute/virtualMachineScaleSets@2024-03-01' = [for orchestrationMode: 'Flexible' zoneBalance: useAvailabilityZones ? true: false platformFaultDomainCount: useAvailabilityZones ? 1: platformFaultDomainCount + singlePlacementGroup: false + // virtualMachineProfile: { + // osProfile: { + // windowsConfiguration: { + // enableAutomaticUpdates: true + // // enableVMAgentPlatformUpdates: true + // // patchSettings : { + // // patchMode: 'AutomaticByPlatform' + // // } + // provisionVMAgent: true + // } + // } + // disk + // } } tags: tags }]