Skip to content

Commit 3f54139

Browse files
danycontreDany Contreras
danycontre
and
Dany Contreras
authored
Updating domain name and GUID settings for EntraID + FSLogixDomain info (#736)
* updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates * updates --------- Co-authored-by: Dany Contreras <dany.contreras@microsoft.com>
1 parent d3dc421 commit 3f54139

25 files changed

+969
-683
lines changed

‎workload/arm/brownfield/deployAppAttachToolsVM.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@
9696
"subscriptionName": ""
9797
},
9898
"metadata": {
99-
"description": "Virtual Network to attach MSIX Tools VM to."
99+
"description": "Virtual Network to attach App Attach Tools VM to."
100100
}
101101
},
102102
"SubnetName": {
103103
"type": "string",
104104
"metadata": {
105-
"description": "Subnet to use for MSIX VM Tools VM."
105+
"description": "Subnet to use for App Attach VM Tools VM."
106106
}
107107
}
108108
},

‎workload/arm/deploy-baseline.json‎

Lines changed: 322 additions & 437 deletions
Large diffs are not rendered by default.

‎workload/bicep/brownfield/appAttachToolsVM/Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Deploy Azure VM with MSIX App Attach Tools
1+
# Deploy Azure VM with App Attach Tools
22
This deployment will create a VM from the Microsoft Gallery and configure and install software for use when creating MSIX App attach images.
33
- MSIX App Attach Store App
44
- MSIX Manager command line tool

‎workload/bicep/deploy-baseline.bicep‎

Lines changed: 72 additions & 155 deletions
Large diffs are not rendered by default.

‎workload/bicep/modules/identity/deploy.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ var storageRoleAssignments = [
9191
// Deployments //
9292
// =========== //
9393

94-
// Managed identity for fslogix/msix app attach
94+
// Managed identity for fslogix/App Attach
9595
module managedIdentityStorage '../../../../avm/1.0.0/res/managed-identity/user-assigned-identity/main.bicep' = if (createStorageDeployment) {
9696
scope: resourceGroup('${subscriptionId}', '${storageObjectsRgName}')
9797
name: 'MI-Storage-${time}'

‎workload/bicep/modules/storageAzureFiles/deploy.bicep‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ param fileShareName string
2929
@sys.description('Private endpoint subnet ID.')
3030
param privateEndpointSubnetId string
3131

32+
@sys.description('VMs subnet ID.')
33+
param vmsSubnetId string
34+
3235
@sys.description('Location where to deploy resources.')
3336
param location string
3437

@@ -152,7 +155,17 @@ module storageAndFile '../../../../avm/1.0.0/res/storage/storage-account/main.bi
152155
defaultAction: 'Deny'
153156
virtualNetworkRules: []
154157
ipRules: []
155-
} : {}
158+
}: {
159+
bypass: 'AzureServices'
160+
defaultAction: 'Deny'
161+
virtualNetworkRules: [
162+
{
163+
id: vmsSubnetId
164+
action: 'Allow'
165+
}
166+
]
167+
ipRules: []
168+
}
156169
fileServices: {
157170
shares: [
158171
{

‎workload/bicep/parameters/deploy-baseline-parameters-example.bicepparam‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ param avdVnetPrivateDnsZoneFilesId = '<<PrivateDnsZoneFilesId>>' // Not a mandat
3838
param avdVnetPrivateDnsZoneKeyvaultId = '<<PrivateDnsZoneKeyvaultId>>' // Not a mandatory parameter
3939
param vNetworkGatewayOnHub = false
4040
param createAvdFslogixDeployment = true
41-
param createMsixDeployment = false
41+
param createAppAttachDeployment = false
4242
param fslogixFileShareQuotaSize = 1
43-
param msixFileShareQuotaSize = 1
43+
param appAttachFileShareQuotaSize = 1
4444
param avdDeploySessionHosts = true
4545
param avdDeploySessionHostsCount = 1
4646
param avdSessionHostCountIndex = 0
4747
param availabilityZonesCompute = true
4848
param zoneRedundantStorage = false
4949
param fslogixStoragePerformance = 'Premium'
50-
param msixStoragePerformance = 'Premium'
50+
param appAttachStoragePerformance = 'Premium'
5151
param avdSessionHostsSize = 'Standard_D2s_v3'
5252
param avdSessionHostDiskType = 'Premium_LRS'
5353
param avdOsImage = 'win11_23h2'

‎workload/bicep/parameters/deploy-baseline-parameters-example.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@
116116
"createAvdFslogixDeployment": {
117117
"value": true
118118
},
119-
"createMsixDeployment": {
119+
"createAppAttachDeployment": {
120120
"value": false
121121
},
122122
"fslogixFileShareQuotaSize": {
123123
"value": 1
124124
},
125-
"msixFileShareQuotaSize": {
125+
"appAttachFileShareQuotaSize": {
126126
"value": 1
127127
},
128128
"avdDeploySessionHosts": {
@@ -149,7 +149,7 @@
149149
"fslogixStoragePerformance": {
150150
"value": "Premium"
151151
},
152-
"msixStoragePerformance": {
152+
"appAttachStoragePerformance": {
153153
"value": "Premium"
154154
},
155155
"avdSessionHostsSize": {

‎workload/docs/autoGenerated/deploy-baseline.bicep.md.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ avdVnetPrivateDnsZoneFilesId | No | Use existing Azure private DNS zone fo
4646
avdVnetPrivateDnsZoneKeyvaultId | No | Use existing Azure private DNS zone for key vault privatelink.vaultcore.azure.net or privatelink.vaultcore.usgovcloudapi.net. (Default: "")
4747
vNetworkGatewayOnHub | No | Does the hub contains a virtual network gateway. (Default: false)
4848
createAvdFslogixDeployment | No | Deploy Fslogix setup. (Default: true)
49-
createMsixDeployment | No | Deploy MSIX App Attach setup. (Default: false)
49+
createAppAttachDeployment | No | Deploy App Attach setup. (Default: false)
5050
fslogixFileShareQuotaSize | No | Fslogix file share size. (Default: 1)
51-
msixFileShareQuotaSize | No | MSIX file share size. (Default: 1)
51+
appAttachFileShareQuotaSize | No | App Attach file share size. (Default: 1)
5252
avdDeploySessionHosts | No | Deploy new session hosts. (Default: true)
5353
deployGpuPolicies | No | Deploy VM GPU extension policies. (Default: false)
5454
avdDeployMonitoring | No | Deploy AVD monitoring resources and setings. (Default: false)
@@ -63,7 +63,7 @@ zoneRedundantStorage | No | When true, Zone Redundant Storage (ZRS) is use
6363
avsetFaultDomainCount | No | Sets the number of fault domains for the availability set. (Default: 2)
6464
avsetUpdateDomainCount | No | Sets the number of update domains for the availability set. (Default: 5)
6565
fslogixStoragePerformance | No | Storage account SKU for FSLogix storage. Recommended tier is Premium (Default: Premium)
66-
msixStoragePerformance | No | Storage account SKU for MSIX storage. Recommended tier is Premium. (Default: Premium)
66+
appAttachStoragePerformance | No | Storage account SKU for App Attach storage. Recommended tier is Premium. (Default: Premium)
6767
diskZeroTrust | No | Enables a zero trust configuration on the session host disks. (Default: false)
6868
avdSessionHostsSize | No | Session host VM size. (Default: Standard_D4ads_v5)
6969
avdSessionHostDiskType | No | OS disk type for session host. (Default: Premium_LRS)
@@ -100,9 +100,9 @@ avdApplicationGroupCustomName | No | AVD desktop application group custom
100100
avdApplicationGroupCustomFriendlyName | No | AVD desktop application group custom friendly (Display) name. (Default: Desktops - App1 - East US - Dev - 001)
101101
avdSessionHostCustomNamePrefix | No | AVD session host prefix custom name. (Default: vmapp1duse2)
102102
avsetCustomNamePrefix | No | AVD availability set custom name. (Default: avail)
103-
storageAccountPrefixCustomName | No | AVD FSLogix and MSIX app attach storage account prefix custom name. (Default: st)
103+
storageAccountPrefixCustomName | No | AVD FSLogix and App Attach storage account prefix custom name. (Default: st)
104104
fslogixFileShareCustomName | No | FSLogix file share name. (Default: fslogix-pc-app1-dev-001)
105-
msixFileShareCustomName | No | MSIX file share name. (Default: msix-app1-dev-001)
105+
appAttach | No | App Attach file share name. (Default: appa-app1-dev-001)
106106
avdWrklKvPrefixCustomName | No | AVD keyvault prefix custom name (with Zero Trust to store credentials to domain join and local admin). (Default: kv-sec)
107107
ztDiskEncryptionSetCustomNamePrefix | No | AVD disk encryption set custom name. (Default: des-zt)
108108
ztManagedIdentityCustomName | No | AVD managed identity for zero trust to encrypt managed disks using a customer managed key. (Default: id-zt)
@@ -427,11 +427,11 @@ Deploy Fslogix setup. (Default: true)
427427

428428
- Default value: `True`
429429

430-
### createMsixDeployment
430+
### createAppAttachDeployment
431431

432432
![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
433433

434-
Deploy MSIX App Attach setup. (Default: false)
434+
Deploy App Attach setup. (Default: false)
435435

436436
- Default value: `False`
437437

@@ -443,11 +443,11 @@ Fslogix file share size. (Default: 1)
443443

444444
- Default value: `1`
445445

446-
### msixFileShareQuotaSize
446+
### appAttachFileShareQuotaSize
447447

448448
![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
449449

450-
MSIX file share size. (Default: 1)
450+
App Attach file share size. (Default: 1)
451451

452452
- Default value: `1`
453453

@@ -563,11 +563,11 @@ Storage account SKU for FSLogix storage. Recommended tier is Premium (Default: P
563563

564564
- Allowed values: `Standard`, `Premium`
565565

566-
### msixStoragePerformance
566+
### appAttachStoragePerformance
567567

568568
![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
569569

570-
Storage account SKU for MSIX storage. Recommended tier is Premium. (Default: Premium)
570+
Storage account SKU for App Attach storage. Recommended tier is Premium. (Default: Premium)
571571

572572
- Default value: `Premium`
573573

@@ -868,7 +868,7 @@ AVD availability set custom name. (Default: avail)
868868

869869
![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
870870

871-
AVD FSLogix and MSIX app attach storage account prefix custom name. (Default: st)
871+
AVD FSLogix and App Attach storage account prefix custom name. (Default: st)
872872

873873
- Default value: `st`
874874

@@ -880,13 +880,13 @@ FSLogix file share name. (Default: fslogix-pc-app1-dev-001)
880880

881881
- Default value: `fslogix-pc-app1-dev-use2-001`
882882

883-
### msixFileShareCustomName
883+
### appAttachFileShareCustomName
884884

885885
![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
886886

887-
MSIX file share name. (Default: msix-app1-dev-001)
887+
App Attach file share name. (Default: appa-app1-dev-001)
888888

889-
- Default value: `msix-app1-dev-use2-001`
889+
- Default value: `appa-app1-dev-use2-001`
890890

891891
### avdWrklKvPrefixCustomName
892892

@@ -1188,13 +1188,13 @@ Enable purge protection for the keyvaults. (Default: true)
11881188
"createAvdFslogixDeployment": {
11891189
"value": true
11901190
},
1191-
"createMsixDeployment": {
1191+
"createAppAttachDeployment": {
11921192
"value": false
11931193
},
11941194
"fslogixFileShareQuotaSize": {
11951195
"value": 1
11961196
},
1197-
"msixFileShareQuotaSize": {
1197+
"appAttachFileShareQuotaSize": {
11981198
"value": 1
11991199
},
12001200
"avdDeploySessionHosts": {
@@ -1239,7 +1239,7 @@ Enable purge protection for the keyvaults. (Default: true)
12391239
"fslogixStoragePerformance": {
12401240
"value": "Premium"
12411241
},
1242-
"msixStoragePerformance": {
1242+
"appAttachStoragePerformance": {
12431243
"value": "Premium"
12441244
},
12451245
"diskZeroTrust": {
@@ -1356,8 +1356,8 @@ Enable purge protection for the keyvaults. (Default: true)
13561356
"fslogixFileShareCustomName": {
13571357
"value": "fslogix-pc-app1-dev-use2-001"
13581358
},
1359-
"msixFileShareCustomName": {
1360-
"value": "msix-app1-dev-use2-001"
1359+
"appAttachFileShareCustomName": {
1360+
"value": "appa-app1-dev-use2-001"
13611361
},
13621362
"avdWrklKvPrefixCustomName": {
13631363
"value": "kv-sec"

‎workload/docs/cost-estimate.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Azure Virtual Desktop resources and dependent services for establishing the base
1818
- Associated Desktop Application Group for personal
1919
- Associated Desktop Application Group and Remote Application Group for pooled
2020
- Azure Files Storage with FSLogix share, RBAC role assignment and private endpoint **
21-
- Azure Files Storage with MSIX App Attach share, RBAC role assignment and private endpoint **
21+
- Azure Files Storage with App Attach share, RBAC role assignment and private endpoint **
2222
- Application Security group
2323
- Key Vault and private endpoint
2424

0 commit comments

Comments
 (0)