Skip to content

Commit 535e374

Browse files
marvinbussmarvinbuss
authored
Updated to Win11 and Updated AIO Deployment Parameters (#240)
* Updated AIO Deployment Parameters * Update to Windows 11
1 parent 7352681 commit 535e374

File tree

8 files changed

+171
-47
lines changed

8 files changed

+171
-47
lines changed

‎docs/reference/bastionhost/main.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ param jumpboxSubnetAddressPrefix string = '10.1.11.0/24'
3636
@description('Specifies the SKU of the virtual machine that gets created.')
3737
param virtualMachineSku string = 'Standard_DS2_v2'
3838
@allowed([
39-
'Windows10'
39+
'Windows11'
4040
'WindowsServer2022'
4141
])
4242
@description('Specifies the image of the virtual machine that gets created.')
43-
param virtualMachineImage string = 'Windows10'
43+
param virtualMachineImage string = 'Windows11'
4444
@description('Specifies the administrator username of the virtual machine.')
4545
param administratorUsername string = 'VmMainUser'
4646
@secure()

‎docs/reference/bastionhost/main.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.4.1008.15138",
8-
"templateHash": "9175258774835994841"
8+
"templateHash": "4335549807263718061"
99
}
1010
},
1111
"parameters": {
@@ -83,12 +83,12 @@
8383
},
8484
"virtualMachineImage": {
8585
"type": "string",
86-
"defaultValue": "Windows10",
86+
"defaultValue": "Windows11",
8787
"metadata": {
8888
"description": "Specifies the image of the virtual machine that gets created."
8989
},
9090
"allowedValues": [
91-
"Windows10",
91+
"Windows11",
9292
"WindowsServer2022"
9393
]
9494
},
@@ -476,7 +476,7 @@
476476
"_generator": {
477477
"name": "bicep",
478478
"version": "0.4.1008.15138",
479-
"templateHash": "11116377257653460648"
479+
"templateHash": "2672844143716454115"
480480
}
481481
},
482482
"parameters": {
@@ -501,9 +501,9 @@
501501
},
502502
"virtualMachineImage": {
503503
"type": "string",
504-
"defaultValue": "Windows10",
504+
"defaultValue": "Windows11",
505505
"allowedValues": [
506-
"Windows10",
506+
"Windows11",
507507
"WindowsServer2022"
508508
]
509509
},
@@ -664,7 +664,7 @@
664664
"_generator": {
665665
"name": "bicep",
666666
"version": "0.4.1008.15138",
667-
"templateHash": "10043636214272501728"
667+
"templateHash": "8684162141135901545"
668668
}
669669
},
670670
"parameters": {
@@ -683,9 +683,9 @@
683683
},
684684
"virtualMachineImage": {
685685
"type": "string",
686-
"defaultValue": "Windows10",
686+
"defaultValue": "Windows11",
687687
"allowedValues": [
688-
"Windows10",
688+
"Windows11",
689689
"WindowsServer2022"
690690
]
691691
},
@@ -704,10 +704,10 @@
704704
"variables": {
705705
"nicName": "[format('{0}-nic', parameters('virtualmachineName'))]",
706706
"diskName": "[format('{0}-disk', parameters('virtualmachineName'))]",
707-
"imageReferenceWindows10": {
708-
"publisher": "MicrosoftWindowsDesktop",
709-
"offer": "Windows-10",
710-
"sku": "20h2-pro",
707+
"imageReferenceWindows11": {
708+
"publisher": "microsoftwindowsdesktop",
709+
"offer": "windows-11",
710+
"sku": "win11-21h2-ent",
711711
"version": "latest"
712712
},
713713
"imageReferenceWindowsServer2022": {
@@ -774,7 +774,7 @@
774774
},
775775
"priority": "Regular",
776776
"storageProfile": {
777-
"imageReference": "[if(equals(parameters('virtualMachineImage'), 'Windows10'), variables('imageReferenceWindows10'), variables('imageReferenceWindowsServer2022'))]",
777+
"imageReference": "[if(equals(parameters('virtualMachineImage'), 'Windows11'), variables('imageReferenceWindows11'), variables('imageReferenceWindowsServer2022'))]",
778778
"osDisk": {
779779
"name": "[variables('diskName')]",
780780
"caching": "ReadWrite",

‎docs/reference/bastionhost/modules/bastion.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ param bastionSubnetId string
1313
param jumpboxSubnetId string
1414
param virtualMachineSku string = 'Standard_DS2_v2'
1515
@allowed([
16-
'Windows10'
16+
'Windows11'
1717
'WindowsServer2022'
1818
])
19-
param virtualMachineImage string = 'Windows10'
19+
param virtualMachineImage string = 'Windows11'
2020
param administratorUsername string = 'VmMainUser'
2121
@secure()
2222
param administratorPassword string

‎docs/reference/bastionhost/modules/services/virtualmachine.bicep‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ param tags object
1111
param virtualmachineName string
1212
param virtualMachineSku string = 'Standard_DS2_v2'
1313
@allowed([
14-
'Windows10'
14+
'Windows11'
1515
'WindowsServer2022'
1616
])
17-
param virtualMachineImage string = 'Windows10'
17+
param virtualMachineImage string = 'Windows11'
1818
param administratorUsername string = 'VmMainUser'
1919
@secure()
2020
param administratorPassword string
@@ -23,10 +23,10 @@ param subnetId string
2323
// Variables
2424
var nicName = '${virtualmachineName}-nic'
2525
var diskName = '${virtualmachineName}-disk'
26-
var imageReferenceWindows10 = {
27-
publisher: 'MicrosoftWindowsDesktop'
28-
offer: 'Windows-10'
29-
sku: '20h2-pro'
26+
var imageReferenceWindows11 = {
27+
publisher: 'microsoftwindowsdesktop'
28+
offer: 'windows-11'
29+
sku: 'win11-21h2-ent'
3030
version: 'latest'
3131
}
3232
var imageReferenceWindowsServer2022 = {
@@ -90,7 +90,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2021-04-01' = {
9090
}
9191
priority: 'Regular'
9292
storageProfile: {
93-
imageReference: virtualMachineImage == 'Windows10' ? imageReferenceWindows10 : imageReferenceWindowsServer2022
93+
imageReference: virtualMachineImage == 'Windows11' ? imageReferenceWindows11 : imageReferenceWindowsServer2022
9494
osDisk: {
9595
name: diskName
9696
caching: 'ReadWrite'

‎docs/reference/bastionhost/portal.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
"label": "VM Image",
273273
"type": "Microsoft.Common.DropDown",
274274
"visible": true,
275-
"defaultValue": "Windows 10",
275+
"defaultValue": "Windows 11",
276276
"toolTip": "Specify the SKU of the Virtual Machine.",
277277
"multiselect": false,
278278
"selectAll": false,
@@ -282,9 +282,9 @@
282282
"constraints": {
283283
"allowedValues": [
284284
{
285-
"label": "Windows 10",
286-
"description": "Windows 10 Pro 20H2",
287-
"value": "Windows10"
285+
"label": "Windows 11",
286+
"description": "Windows 11 Enterprise 21H2",
287+
"value": "Windows11"
288288
},
289289
{
290290
"label": "Windows Server 2022",

‎docs/reference/enterpriseScaleAnalytics.bicep‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ param dataManagementZonePrefix string
2323
param dataManagementZoneLocation string
2424

2525
// Data Landing Zone Parameters
26+
@description('Specifies the administrator username of the Synapse workspace and the virtual machine scale sets.')
27+
param administratorUsername string = 'SuperMainUser'
2628
@description('Specifies the administrator password of the Synapse workspace and the virtual machine scale sets.')
2729
param administratorPassword string
2830
@description('Specifies the details of each Data Landing Zone in an array of objects.')
@@ -31,6 +33,12 @@ param dataLandingZoneDetails array
3133
param dataLandingZonePrefix string
3234
@description('Specifies whether Azure Bastion will be deployed in the first Data Landing Zone.')
3335
param enableBastionHostDeployment bool
36+
@allowed([
37+
'Windows11'
38+
'WindowsServer2022'
39+
])
40+
@description('Specifies the image of the virtual machine jumpbox that gets created for Azure Bastion.')
41+
param virtualMachineImage string = 'Windows11'
3442

3543
// Variables
3644
var dataManagementZoneTemplateLink = 'https://raw.githubusercontent.com/Azure/data-management-zone/main/infra/main.json'
@@ -101,6 +109,9 @@ resource dataManagementZoneDeployment 'Microsoft.Resources/deployments@2021-04-0
101109
privateDnsZoneIdPurview: {
102110
value: ''
103111
}
112+
privateDnsZoneIdPurviewPortal: {
113+
value: ''
114+
}
104115
privateDnsZoneIdQueue: {
105116
value: ''
106117
}
@@ -193,9 +204,6 @@ resource dataLandingZoneDeployment 'Microsoft.Resources/deployments@2021-04-01'
193204
purviewSelfHostedIntegrationRuntimeAuthKey: {
194205
value: ''
195206
}
196-
portalDeployment: {
197-
value: true
198-
}
199207
deploySelfHostedIntegrationRuntimes: {
200208
value: true
201209
}
@@ -238,11 +246,18 @@ module bastionHostDeployment 'bastionhost/main.bicep' = if (enableBastionHostDep
238246
scope: subscription(dataLandingZoneDetails[0].subscription)
239247
params: {
240248
location: dataLandingZoneDetails[0].location
249+
environment: environment
241250
prefix: '${dataLandingZonePrefix}${padLeft(1, 3, '0')}'
251+
tags: tags
252+
administratorUsername: administratorUsername
242253
administratorPassword: administratorPassword
243254
vnetId: reference(dataLandingZoneDeployment[0].name).outputs.vnetId.value
244255
defaultNsgId: reference(dataLandingZoneDeployment[0].name).outputs.nsgId.value
245256
defaultRouteTableId: reference(dataLandingZoneDeployment[0].name).outputs.routeTableId.value
257+
bastionSubnetAddressPrefix: '10.1.10.0/24'
258+
jumpboxSubnetAddressPrefix: '10.1.11.0/24'
259+
virtualMachineSku: 'Standard_DS2_v2'
260+
virtualMachineImage: virtualMachineImage
246261
}
247262
}
248263

0 commit comments

Comments
 (0)