Skip to content

Commit 44784f3

Browse files
author
Dany Contreras
committed
updates
1 parent 3f91776 commit 44784f3

File tree

3 files changed

+31
-32
lines changed

3 files changed

+31
-32
lines changed

‎workload/arm/deploy-baseline.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "18244379325960342173"
8+
"templateHash": "12832927688343584926"
99
},
1010
"name": "AVD Accelerator - Baseline Deployment",
1111
"description": "AVD Accelerator - Deployment Baseline",
@@ -274,23 +274,23 @@
274274
},
275275
"avdVnetworkAddressPrefixes": {
276276
"type": "string",
277-
"defaultValue": "10.10.0.0/23",
277+
"defaultValue": "10.10.0.0/16",
278278
"metadata": {
279-
"description": "AVD virtual network address prefixes. (Default: 10.10.0.0/23)"
279+
"description": "AVD virtual network address prefixes. (Default: 10.10.0.0/16)"
280280
}
281281
},
282282
"vNetworkAvdSubnetAddressPrefix": {
283283
"type": "string",
284-
"defaultValue": "10.10.0.0/24",
284+
"defaultValue": "10.10.1.0/24",
285285
"metadata": {
286-
"description": "AVD virtual network subnet address prefix. (Default: 10.10.0.0/23)"
286+
"description": "AVD virtual network subnet address prefix. (Default: 10.10.1.0/24)"
287287
}
288288
},
289289
"vNetworkPrivateEndpointSubnetAddressPrefix": {
290290
"type": "string",
291-
"defaultValue": "10.10.1.0/27",
291+
"defaultValue": "10.10.2.0/27",
292292
"metadata": {
293-
"description": "private endpoints virtual network subnet address prefix. (Default: 10.10.1.0/27)"
293+
"description": "private endpoints virtual network subnet address prefix. (Default: 10.10.2.0/27)"
294294
}
295295
},
296296
"customDnsIps": {
@@ -1751,7 +1751,7 @@
17511751
"Purpose": "Disk encryption keys for zero trust"
17521752
},
17531753
"varTelemetryId": "[format('pid-2ce4228c-d72c-43fb-bb5b-cd8f3ba2138e-{0}', parameters('avdManagementPlaneLocation'))]",
1754-
"verResourceGroups": [
1754+
"varResourceGroups": [
17551755
{
17561756
"purpose": "Service-Objects",
17571757
"name": "[variables('varServiceObjectsRgName')]",
@@ -1911,11 +1911,11 @@
19111911
{
19121912
"copy": {
19131913
"name": "baselineResourceGroups",
1914-
"count": "[length(variables('verResourceGroups'))]"
1914+
"count": "[length(variables('varResourceGroups'))]"
19151915
},
19161916
"type": "Microsoft.Resources/deployments",
19171917
"apiVersion": "2022-09-01",
1918-
"name": "[format('{0}-{1}', variables('verResourceGroups')[copyIndex()].purpose, parameters('time'))]",
1918+
"name": "[format('{0}-{1}', variables('varResourceGroups')[copyIndex()].purpose, parameters('time'))]",
19191919
"subscriptionId": "[parameters('avdWorkloadSubsId')]",
19201920
"location": "[deployment().location]",
19211921
"properties": {
@@ -1925,16 +1925,16 @@
19251925
"mode": "Incremental",
19261926
"parameters": {
19271927
"name": {
1928-
"value": "[variables('verResourceGroups')[copyIndex()].name]"
1928+
"value": "[variables('varResourceGroups')[copyIndex()].name]"
19291929
},
19301930
"location": {
1931-
"value": "[variables('verResourceGroups')[copyIndex()].location]"
1931+
"value": "[variables('varResourceGroups')[copyIndex()].location]"
19321932
},
19331933
"enableTelemetry": {
1934-
"value": "[variables('verResourceGroups')[copyIndex()].enableDefaultTelemetry]"
1934+
"value": "[variables('varResourceGroups')[copyIndex()].enableDefaultTelemetry]"
19351935
},
19361936
"tags": {
1937-
"value": "[variables('verResourceGroups')[copyIndex()].tags]"
1937+
"value": "[variables('varResourceGroups')[copyIndex()].tags]"
19381938
}
19391939
},
19401940
"template": {

‎workload/bicep/deploy-baseline.bicep

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ param existingVnetPrivateEndpointSubnetResourceId string = ''
146146
@sys.description('Existing hub virtual network for perring. (Default: "")')
147147
param existingHubVnetResourceId string = ''
148148

149-
@sys.description('AVD virtual network address prefixes. (Default: 10.10.0.0/23)')
150-
param avdVnetworkAddressPrefixes string = '10.10.0.0/23'
149+
@sys.description('AVD virtual network address prefixes. (Default: 10.10.0.0/16)')
150+
param avdVnetworkAddressPrefixes string = '10.10.0.0/16'
151151

152-
@sys.description('AVD virtual network subnet address prefix. (Default: 10.10.0.0/23)')
153-
param vNetworkAvdSubnetAddressPrefix string = '10.10.0.0/24'
152+
@sys.description('AVD virtual network subnet address prefix. (Default: 10.10.1.0/24)')
153+
param vNetworkAvdSubnetAddressPrefix string = '10.10.1.0/24'
154154

155-
@sys.description('private endpoints virtual network subnet address prefix. (Default: 10.10.1.0/27)')
156-
param vNetworkPrivateEndpointSubnetAddressPrefix string = '10.10.1.0/27'
155+
@sys.description('private endpoints virtual network subnet address prefix. (Default: 10.10.2.0/27)')
156+
param vNetworkPrivateEndpointSubnetAddressPrefix string = '10.10.2.0/27'
157157

158158
@sys.description('custom DNS servers IPs. (Default: "")')
159159
param customDnsIps string = ''
@@ -926,7 +926,7 @@ var varZtKeyvaultTag = {
926926
}
927927
//
928928
var varTelemetryId = 'pid-2ce4228c-d72c-43fb-bb5b-cd8f3ba2138e-${avdManagementPlaneLocation}'
929-
var verResourceGroups = [
929+
var varResourceGroups = [
930930
{
931931
purpose: 'Service-Objects'
932932
name: varServiceObjectsRgName
@@ -981,7 +981,7 @@ module baselineNetworkResourceGroup '../../avm/1.0.0/res/resources/resource-grou
981981

982982
// Compute, service objects
983983
module baselineResourceGroups '../../avm/1.0.0/res/resources/resource-group/main.bicep' = [
984-
for resourceGroup in verResourceGroups: {
984+
for resourceGroup in varResourceGroups: {
985985
scope: subscription(avdWorkloadSubsId)
986986
name: '${resourceGroup.purpose}-${time}'
987987
params: {

‎workload/portal-ui/portal-ui-baseline.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@
11881188
"visible": "[steps('network').createAvdVirtualNetwork]",
11891189
"label": "vNet address range",
11901190
"toolTip": "Virtual network CIDR for Azure Virtual Desktop virtual machines and PaaS private endpoints",
1191-
"placeholder": "Example: 10.10.0.0/23",
1191+
"placeholder": "Example: 10.10.0.0/16",
11921192
"constraints": {
11931193
"required": true,
11941194
"regex": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(?:\/(1[0-9]|2[0-4]))$",
@@ -1201,7 +1201,7 @@
12011201
"visible": "[steps('network').createAvdVirtualNetwork]",
12021202
"label": "Azure Virtual Desktop subnet address prefix",
12031203
"toolTip": "Virtual network subnet CIDR for Azure Virtual Desktop virtual machines",
1204-
"placeholder": "Example: 10.10.0.0/24",
1204+
"placeholder": "Example: 10.10.1.0/24",
12051205
"constraints": {
12061206
"required": true,
12071207
"regex": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(?:\/(1[0-9]|2[0-4]))$",
@@ -1360,7 +1360,7 @@
13601360
"visible": "[and(equals(steps('network').createAvdVirtualNetwork, true), or(equals(steps('network').deployPrivateEndpointKeyvaultStorage, true), equals(steps('network').deployAvdPrivateLinkService, true)))]",
13611361
"label": "Private endpoint subnet address prefix",
13621362
"toolTip": "Virtual network subnet CIDR for private endpoints",
1363-
"placeholder": "Example: 10.10.1.0/27",
1363+
"placeholder": "Example: 10.10.2.0/27",
13641364
"constraints": {
13651365
"required": true,
13661366
"regex": "^(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(?:\/(1[0-9]|2[0-7]))$",
@@ -2536,8 +2536,8 @@
25362536
"avdVmLocalUserName": "[steps('identity').identityLocalCredentials.identityLocalUserName]",
25372537
"avdVmLocalUserPassword": "[steps('identity').identityLocalCredentials.identityLocalUserPassword.password]",
25382538
"createAvdVnet": "[steps('network').createAvdVirtualNetwork]",
2539-
"avdVnetworkAddressPrefixes": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkSize, '10.10.0.0/23')]",
2540-
"vNetworkAvdSubnetAddressPrefix": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkAvdSubnetSize, '10.10.0.0/24')]",
2539+
"avdVnetworkAddressPrefixes": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkSize, '10.10.1.0/24')]",
2540+
"vNetworkAvdSubnetAddressPrefix": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkAvdSubnetSize, '10.10.2.0/27')]",
25412541
"vNetworkPrivateEndpointSubnetAddressPrefix": "[if(and(equals(steps('network').createAvdVirtualNetwork, true), equals(steps('network').deployPrivateEndpointKeyvaultStorage, true)), steps('network').virtualNetworkPrivateEndpointSubnetSize, '10.10.1.0/27')]",
25422542
"customDnsIps": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkDns, '')]",
25432543
"existingHubVnetResourceId": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').hubVirtualNetworkPeering.existingHubVirtualNetwork, '')]",
@@ -2630,12 +2630,11 @@
26302630
"ztKvPrefixCustomName ": "[steps('resourceNaming').resourceNamingZeroTrust.zeroTrustObjectsKeyVaultCustomPrefix]",
26312631
"ztManagedIdentityCustomName": "[steps('resourceNaming').resourceNamingZeroTrust.zeroTrustObjectsManagedIdentityCustomName]",
26322632
"deployGpuPolicies": "[steps('sessionHosts').sessionHostsSettingsSection.gpuExtensionPolicy]",
2633-
26342633
"enableDef": "[steps('identity').identiyEnableDefOptions.enableDef]",
2635-
"enableDefForServers": "[steps('identity').identiyEnableDefOptions.enableDefForServers]",
2636-
"enableDefForStorage": "[steps('identity').identiyEnableDefOptions.enableDefForStorage]",
2637-
"enableDefForKeyVault": "[steps('identity').identiyEnableDefOptions.enableDefForKeyVault]",
2638-
"enableDefForArm": "[steps('identity').identiyEnableDefOptions.enableDefForArm]"
2634+
"enableDefForServers": "[if(equals(steps('identity').identiyEnableDefOptions.enableDef, true), steps('identity').identiyEnableDefOptions.enableDefForServers, false)]",
2635+
"enableDefForStorage": "[if(equals(steps('identity').identiyEnableDefOptions.enableDef, true), steps('identity').identiyEnableDefOptions.enableDefForStorage, false)]",
2636+
"enableDefForKeyVault": "[if(equals(steps('identity').identiyEnableDefOptions.enableDef, true), steps('identity').identiyEnableDefOptions.enableDefForKeyVault, false)]",
2637+
"enableDefForArm": "[if(equals(steps('identity').identiyEnableDefOptions.enableDef, true), steps('identity').identiyEnableDefOptions.enableDefForArm, false)]"
26392638
},
26402639
"kind": "Subscription",
26412640
"location": "[steps('basics').resourceScope.location.name]",

0 commit comments

Comments
 (0)