Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESRI Enterprise Add-On: SFI & ZTA updates #1135

Merged
merged 9 commits into from
Nov 28, 2024
Prev Previous commit
Next Next commit
Fixed conditions in AVD Add-On & missing params in Tier3 for storage (#…
…1123)

* Fixed value in condition

* Fixed value in condition & missing params

* Fixed missing params

* Fixed resource prefix length in documentation

* Fixed token used for antivirus exclusions

* Updated conditions

* Fixed conditions for FSLogix

* Compiled bicep changes

* Fixed UI conditions for profiles
  • Loading branch information
jamasten authored Nov 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f3b845996520357d5ed47681a231fd076d241de0
2 changes: 1 addition & 1 deletion docs/deployment-guides/command-line-tools.md
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ The following prerequisites are required on the target Azure subscription(s):

### Decide on a Resource Prefix

Resource Groups and resource names are derived from the required parameter `resourcePrefix`. Pick a unqiue resource prefix that is 3-6 alphanumeric characters in length without whitespaces.
Resource Groups and resource names are derived from the required parameter `resourcePrefix`. Pick a unqiue resource prefix that is 1-6 alphanumeric characters in length without whitespaces.

### One Subscription or Multiple

Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ var tagsNetAppAccount = union({'cm-resource-parent': '${subscription().id}}/reso
var tagsVirtualMachines = union({'cm-resource-parent': '${subscription().id}}/resourceGroups/${resourceGroupControlPlane}/providers/Microsoft.DesktopVirtualization/hostpools/${hostPoolName}'}, contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}, mlzTags)

// Azure NetApp Files for Fslogix
module azureNetAppFiles 'azureNetAppFiles.bicep' = if (storageService == 'AzureNetAppFiles' && contains(activeDirectorySolution, 'DomainServices')) {
module azureNetAppFiles 'azureNetAppFiles.bicep' = if (storageService == 'AzureNetAppFiles') {
name: 'deploy-anf-${deploymentNameSuffix}'
scope: resourceGroup(resourceGroupStorage)
params: {
@@ -78,7 +78,7 @@ module azureNetAppFiles 'azureNetAppFiles.bicep' = if (storageService == 'AzureN
}

// Azure Files for FSLogix
module azureFiles 'azureFiles/azureFiles.bicep' = if (storageService == 'AzureFiles' && contains(activeDirectorySolution, 'DomainServices')) {
module azureFiles 'azureFiles/azureFiles.bicep' = if (storageService == 'AzureFiles') {
name: 'deploy-azure-files-${deploymentNameSuffix}'
scope: resourceGroup(resourceGroupStorage)
params: {
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ var imageReference = empty(imageVersionResourceId) ? {
} : {
id: imageVersionResourceId
}
var intune = contains(activeDirectorySolution, 'intuneEnrollment')
var intune = contains(activeDirectorySolution, 'IntuneEnrollment')
var nvidiaVmSize = contains(nvidiaVmSizes, virtualMachineSize)
var nvidiaVmSizes = [
'Standard_NV6'
@@ -94,7 +94,7 @@ var nvidiaVmSizes = [
]
var pooledHostPool = (split(hostPoolType, ' ')[0] == 'Pooled')
var sessionHostNamePrefix = replace(virtualMachineNamePrefix, serviceToken, '')
var storageAccountToken = take('${storageAccountPrefix}??${uniqueToken}', 24)
var storageAccountToken = '${storageAccountPrefix}??' // The token is used for AntiVirus exclusions. The '??' represents the two digits at the end of each storage account name.

resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' existing = {
name: hostPoolName
10 changes: 4 additions & 6 deletions src/bicep/add-ons/azure-virtual-desktop/solution.bicep
Original file line number Diff line number Diff line change
@@ -114,7 +114,7 @@ param fslogixContainerType string = 'ProfileContainer'
'AzureNetAppFiles Standard' // ANF with the Standard SKU, 320,000 IOPS
'AzureFiles Premium' // Azure Files Premium with a Private Endpoint, 100,000 IOPS
'AzureFiles Standard' // Azure Files Standard with the Large File Share option and a Private Endpoint, 20,000 IOPS
'None'
'None' // Local Profiles
])
@description('Enable an Fslogix storage option to manage user profiles for the AVD session hosts. The selected service & SKU should provide sufficient IOPS for all of your users. https://docs.microsoft.com/en-us/azure/architecture/example-scenario/wvd/windows-virtual-desktop-fslogix#performance-requirements')
param fslogixStorageService string = 'AzureFiles Standard'
@@ -316,9 +316,7 @@ var availabilitySetsCount = length(range(beginAvSetRange, (endAvSetRange - begin

// OTHER LOGIC & COMPUTED VALUES
var customImageId = empty(imageVersionResourceId) ? 'null' : '"${imageVersionResourceId}"'
var deployFslogix = fslogixStorageService == 'None' || !contains(activeDirectorySolution, 'DomainServices')
? false
: true
var deployFslogix = contains(fslogixStorageService, 'Azure') && contains(activeDirectorySolution, 'DomainServices') ? true : false
var fileShareNames = {
CloudCacheProfileContainer: [
'profile-containers'
@@ -622,7 +620,7 @@ module workspaces 'modules/sharedServices/sharedServices.bicep' = {
}
}

module fslogix 'modules/fslogix/fslogix.bicep' = {
module fslogix 'modules/fslogix/fslogix.bicep' = if (deployFslogix) {
name: 'deploy-fslogix-${deploymentNameSuffix}'
params: {
activeDirectorySolution: activeDirectorySolution
@@ -726,7 +724,7 @@ module sessionHosts 'modules/sessionHosts/sessionHosts.bicep' = {
serviceToken: tier3_hosts.outputs.tokens.service
sessionHostBatchCount: sessionHostBatchCount
sessionHostIndex: sessionHostIndex
storageAccountNamePrefix: fslogix.outputs.storageAccountNamePrefix
storageAccountNamePrefix: deployFslogix ? fslogix.outputs.storageAccountNamePrefix : ''
storageCount: storageCount
storageIndex: storageIndex
storageService: storageService
Loading