Skip to content

Commit 39e1cef

Browse files
danycontreDany Contreras
danycontre
and
Dany Contreras
authored
Remove VMSS flex availability option (#740)
* updates * updates * updates * updates * updates --------- Co-authored-by: Dany Contreras <[email protected]>
1 parent e5f50c5 commit 39e1cef

25 files changed

+102
-2309
lines changed

‎workload/arm/brownfield/deployAddAvdAgents.json

+4-7
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": "5329968786039512480"
8+
"templateHash": "5147644066952840608"
99
}
1010
},
1111
"parameters": {
@@ -1708,7 +1708,7 @@
17081708
"_generator": {
17091709
"name": "bicep",
17101710
"version": "0.33.93.31351",
1711-
"templateHash": "909547921079816535"
1711+
"templateHash": "12732844867802063090"
17121712
}
17131713
},
17141714
"parameters": {
@@ -1741,14 +1741,11 @@
17411741
"metadata": {
17421742
"description": "AVD Host Pool registration token"
17431743
}
1744-
},
1745-
"IdentityServiceProvider": {
1746-
"type": "string",
1747-
"defaultValue": "ADDS"
17481744
}
17491745
},
17501746
"variables": {
1751-
"varScriptArguments": "[format('-AmdVmSize $false -IdentityServiceProvider {0} -Fslogix $false -HostPoolRegistrationToken {1} -NvidiaVmSize $false -verbose', parameters('IdentityServiceProvider'), parameters('hostPoolToken'))]"
1747+
"varIdentityServiceProvider": "null",
1748+
"varScriptArguments": "[format('-AmdVmSize $false -IdentityServiceProvider {0} -Fslogix $false -HostPoolRegistrationToken {1} -NvidiaVmSize $false -verbose', variables('varIdentityServiceProvider'), parameters('hostPoolToken'))]"
17521749
},
17531750
"resources": [
17541751
{

‎workload/arm/brownfield/deployNewSessionHostsToHostPools.json

+44-79
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.31.92.45157",
8-
"templateHash": "749569359900022380"
7+
"version": "0.33.93.31351",
8+
"templateHash": "9306833565688201881"
99
}
1010
},
1111
"parameters": {
@@ -30,13 +30,6 @@
3030
"description": "Application Security Group (ASG) for the session hosts. (Default: \"\")"
3131
}
3232
},
33-
"virtualMachineScaleSetResourceId": {
34-
"type": "string",
35-
"defaultValue": "",
36-
"metadata": {
37-
"description": "VMSS flex resource ID. (Default: \"\")"
38-
}
39-
},
4033
"customImageDefinitionId": {
4134
"type": "string",
4235
"defaultValue": "",
@@ -246,7 +239,7 @@
246239
"type": "bool",
247240
"defaultValue": true,
248241
"metadata": {
249-
"description": "Creates an availability zone and adds the VMs to it. Cannot be used in combination with availability set nor scale set. (Default: true)"
242+
"description": "When true VMs are distributed across availability zones, when set to false, VMs will be deployed at regional level. (Default: true)"
250243
}
251244
},
252245
"identityServiceProvider": {
@@ -877,8 +870,8 @@
877870
"metadata": {
878871
"_generator": {
879872
"name": "bicep",
880-
"version": "0.31.92.45157",
881-
"templateHash": "7911012203047473872"
873+
"version": "0.33.93.31351",
874+
"templateHash": "13233883945180272639"
882875
},
883876
"name": "Azure Virtual Desktop Host Pool",
884877
"description": "This module deploys an Azure Virtual Desktop Host Pool",
@@ -1394,7 +1387,7 @@
13941387
},
13951388
"hostPool": {
13961389
"type": "Microsoft.DesktopVirtualization/hostPools",
1397-
"apiVersion": "2023-09-05",
1390+
"apiVersion": "2024-04-08-preview",
13981391
"name": "[parameters('name')]",
13991392
"location": "[parameters('location')]",
14001393
"tags": "[parameters('tags')]",
@@ -1488,8 +1481,8 @@
14881481
"metadata": {
14891482
"_generator": {
14901483
"name": "bicep",
1491-
"version": "0.31.92.45157",
1492-
"templateHash": "244342216444934455"
1484+
"version": "0.33.93.31351",
1485+
"templateHash": "17400304622639006546"
14931486
},
14941487
"name": "Key Vault Secrets",
14951488
"description": "This module deploys a Key Vault Secret.",
@@ -1642,12 +1635,12 @@
16421635
"keyVault": {
16431636
"existing": true,
16441637
"type": "Microsoft.KeyVault/vaults",
1645-
"apiVersion": "2022-07-01",
1638+
"apiVersion": "2023-07-01",
16461639
"name": "[parameters('keyVaultName')]"
16471640
},
16481641
"secret": {
16491642
"type": "Microsoft.KeyVault/vaults/secrets",
1650-
"apiVersion": "2022-07-01",
1643+
"apiVersion": "2023-07-01",
16511644
"name": "[format('{0}/{1}', parameters('keyVaultName'), parameters('name'))]",
16521645
"tags": "[parameters('tags')]",
16531646
"properties": {
@@ -1658,10 +1651,7 @@
16581651
"nbf": "[parameters('attributesNbf')]"
16591652
},
16601653
"value": "[parameters('value')]"
1661-
},
1662-
"dependsOn": [
1663-
"keyVault"
1664-
]
1654+
}
16651655
},
16661656
"secret_roleAssignments": {
16671657
"copy": {
@@ -2402,7 +2392,7 @@
24022392
"metadata": {
24032393
"description": "The location of the host pool."
24042394
},
2405-
"value": "[reference('hostPool', '2023-09-05', 'full').location]"
2395+
"value": "[reference('hostPool', '2024-04-08-preview', 'full').location]"
24062396
},
24072397
"keyVaultTokenSecretResourceId": {
24082398
"type": "string",
@@ -2447,7 +2437,6 @@
24472437
"encryptionAtHost": {
24482438
"value": "[parameters('diskZeroTrust')]"
24492439
},
2450-
"virtualMachineScaleSetResourceId": "[if(not(empty(parameters('virtualMachineScaleSetResourceId'))), createObject('value', parameters('virtualMachineScaleSetResourceId')), createObject('value', ''))]",
24512440
"osType": {
24522441
"value": "Windows"
24532442
},
@@ -2521,8 +2510,8 @@
25212510
"metadata": {
25222511
"_generator": {
25232512
"name": "bicep",
2524-
"version": "0.31.92.45157",
2525-
"templateHash": "14479592012746135131"
2513+
"version": "0.33.93.31351",
2514+
"templateHash": "11050393703898934384"
25262515
},
25272516
"name": "Virtual Machines",
25282517
"description": "This module deploys a Virtual Machine with one or multiple NICs and optionally one or multiple public IPs.",
@@ -3351,8 +3340,8 @@
33513340
"metadata": {
33523341
"_generator": {
33533342
"name": "bicep",
3354-
"version": "0.31.92.45157",
3355-
"templateHash": "16115740980907913961"
3343+
"version": "0.33.93.31351",
3344+
"templateHash": "11733090358061195696"
33563345
}
33573346
},
33583347
"definitions": {
@@ -4904,8 +4893,8 @@
49044893
"metadata": {
49054894
"_generator": {
49064895
"name": "bicep",
4907-
"version": "0.31.92.45157",
4908-
"templateHash": "688718350646227538"
4896+
"version": "0.33.93.31351",
4897+
"templateHash": "6738255057321581868"
49094898
},
49104899
"name": "Virtual Machine Extensions",
49114900
"description": "This module deploys a Virtual Machine Extension.",
@@ -5020,10 +5009,7 @@
50205009
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
50215010
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
50225011
"suppressFailures": "[parameters('supressFailures')]"
5023-
},
5024-
"dependsOn": [
5025-
"virtualMachine"
5026-
]
5012+
}
50275013
}
50285014
},
50295015
"outputs": {
@@ -5113,8 +5099,8 @@
51135099
"metadata": {
51145100
"_generator": {
51155101
"name": "bicep",
5116-
"version": "0.31.92.45157",
5117-
"templateHash": "688718350646227538"
5102+
"version": "0.33.93.31351",
5103+
"templateHash": "6738255057321581868"
51185104
},
51195105
"name": "Virtual Machine Extensions",
51205106
"description": "This module deploys a Virtual Machine Extension.",
@@ -5229,10 +5215,7 @@
52295215
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
52305216
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
52315217
"suppressFailures": "[parameters('supressFailures')]"
5232-
},
5233-
"dependsOn": [
5234-
"virtualMachine"
5235-
]
5218+
}
52365219
}
52375220
},
52385221
"outputs": {
@@ -5317,8 +5300,8 @@
53175300
"metadata": {
53185301
"_generator": {
53195302
"name": "bicep",
5320-
"version": "0.31.92.45157",
5321-
"templateHash": "688718350646227538"
5303+
"version": "0.33.93.31351",
5304+
"templateHash": "6738255057321581868"
53225305
},
53235306
"name": "Virtual Machine Extensions",
53245307
"description": "This module deploys a Virtual Machine Extension.",
@@ -5433,10 +5416,7 @@
54335416
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
54345417
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
54355418
"suppressFailures": "[parameters('supressFailures')]"
5436-
},
5437-
"dependsOn": [
5438-
"virtualMachine"
5439-
]
5419+
}
54405420
}
54415421
},
54425422
"outputs": {
@@ -5528,8 +5508,8 @@
55285508
"metadata": {
55295509
"_generator": {
55305510
"name": "bicep",
5531-
"version": "0.31.92.45157",
5532-
"templateHash": "688718350646227538"
5511+
"version": "0.33.93.31351",
5512+
"templateHash": "6738255057321581868"
55335513
},
55345514
"name": "Virtual Machine Extensions",
55355515
"description": "This module deploys a Virtual Machine Extension.",
@@ -5644,10 +5624,7 @@
56445624
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
56455625
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
56465626
"suppressFailures": "[parameters('supressFailures')]"
5647-
},
5648-
"dependsOn": [
5649-
"virtualMachine"
5650-
]
5627+
}
56515628
}
56525629
},
56535630
"outputs": {
@@ -5732,8 +5709,8 @@
57325709
"metadata": {
57335710
"_generator": {
57345711
"name": "bicep",
5735-
"version": "0.31.92.45157",
5736-
"templateHash": "688718350646227538"
5712+
"version": "0.33.93.31351",
5713+
"templateHash": "6738255057321581868"
57375714
},
57385715
"name": "Virtual Machine Extensions",
57395716
"description": "This module deploys a Virtual Machine Extension.",
@@ -5848,10 +5825,7 @@
58485825
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
58495826
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
58505827
"suppressFailures": "[parameters('supressFailures')]"
5851-
},
5852-
"dependsOn": [
5853-
"virtualMachine"
5854-
]
5828+
}
58555829
}
58565830
},
58575831
"outputs": {
@@ -5933,8 +5907,8 @@
59335907
"metadata": {
59345908
"_generator": {
59355909
"name": "bicep",
5936-
"version": "0.31.92.45157",
5937-
"templateHash": "688718350646227538"
5910+
"version": "0.33.93.31351",
5911+
"templateHash": "6738255057321581868"
59385912
},
59395913
"name": "Virtual Machine Extensions",
59405914
"description": "This module deploys a Virtual Machine Extension.",
@@ -6049,10 +6023,7 @@
60496023
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
60506024
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
60516025
"suppressFailures": "[parameters('supressFailures')]"
6052-
},
6053-
"dependsOn": [
6054-
"virtualMachine"
6055-
]
6026+
}
60566027
}
60576028
},
60586029
"outputs": {
@@ -6198,8 +6169,8 @@
61986169
"metadata": {
61996170
"_generator": {
62006171
"name": "bicep",
6201-
"version": "0.31.92.45157",
6202-
"templateHash": "688718350646227538"
6172+
"version": "0.33.93.31351",
6173+
"templateHash": "6738255057321581868"
62036174
},
62046175
"name": "Virtual Machine Extensions",
62056176
"description": "This module deploys a Virtual Machine Extension.",
@@ -6314,10 +6285,7 @@
63146285
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
63156286
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
63166287
"suppressFailures": "[parameters('supressFailures')]"
6317-
},
6318-
"dependsOn": [
6319-
"virtualMachine"
6320-
]
6288+
}
63216289
}
63226290
},
63236291
"outputs": {
@@ -6415,8 +6383,8 @@
64156383
"metadata": {
64166384
"_generator": {
64176385
"name": "bicep",
6418-
"version": "0.31.92.45157",
6419-
"templateHash": "688718350646227538"
6386+
"version": "0.33.93.31351",
6387+
"templateHash": "6738255057321581868"
64206388
},
64216389
"name": "Virtual Machine Extensions",
64226390
"description": "This module deploys a Virtual Machine Extension.",
@@ -6531,10 +6499,7 @@
65316499
"settings": "[if(not(empty(parameters('settings'))), parameters('settings'), null())]",
65326500
"protectedSettings": "[if(not(empty(parameters('protectedSettings'))), parameters('protectedSettings'), null())]",
65336501
"suppressFailures": "[parameters('supressFailures')]"
6534-
},
6535-
"dependsOn": [
6536-
"virtualMachine"
6537-
]
6502+
}
65386503
}
65396504
},
65406505
"outputs": {
@@ -6603,8 +6568,8 @@
66036568
"metadata": {
66046569
"_generator": {
66056570
"name": "bicep",
6606-
"version": "0.31.92.45157",
6607-
"templateHash": "1959824779647032366"
6571+
"version": "0.33.93.31351",
6572+
"templateHash": "6919490302839277834"
66086573
}
66096574
},
66106575
"parameters": {
@@ -6701,8 +6666,8 @@
67016666
"metadata": {
67026667
"_generator": {
67036668
"name": "bicep",
6704-
"version": "0.31.92.45157",
6705-
"templateHash": "13662816901696617653"
6669+
"version": "0.33.93.31351",
6670+
"templateHash": "6026927917548225141"
67066671
}
67076672
},
67086673
"parameters": {

0 commit comments

Comments
 (0)