Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
danycontre committed Sep 27, 2024
1 parent b8e0481 commit cdbe1f8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
9 changes: 5 additions & 4 deletions workload/arm/deploy-baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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')))]",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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')]"
}
Expand Down
2 changes: 1 addition & 1 deletion workload/bicep/deploy-baseline.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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}"'
Expand Down
14 changes: 14 additions & 0 deletions workload/bicep/modules/avdSessionHosts/.bicep/vmScaleSet.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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
}]

0 comments on commit cdbe1f8

Please sign in to comment.