Skip to content

Commit aa410eb

Browse files
brwilkinsonbrwilkinson
committed
update AVD tenant
1 parent 776985c commit aa410eb

File tree

7 files changed

+2663
-1
lines changed

7 files changed

+2663
-1
lines changed

‎ADF/release-az/azSet.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ function Global:AzSet
22
{
33
param (
44
[parameter(Mandatory)]
5-
[ValidateSet('ABC', 'AKS', 'AOA', 'CTL', 'GW', 'HUB', 'LAB', 'PST', 'SFM', 'AD')]
5+
[ValidateSet('ABC', 'AKS', 'AOA', 'CTL', 'GW', 'HUB', 'LAB', 'PST', 'SFM', 'AD', 'AVD')]
66
[alias('AppName')]
77
[string] $App,
88
[parameter(Mandatory)]

‎ADF/tenants/AVD/AEU1.D1.bicepparam

Lines changed: 356 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,356 @@
1+
using '../../bicep/00-ALL-SUB.bicep'
2+
3+
param Global = union(
4+
loadJsonContent('Global-${Prefix}.json'),
5+
loadJsonContent('Global-Global.json'),
6+
loadJsonContent('Global-Config.json')
7+
)
8+
9+
param Prefix = 'AEU1'
10+
11+
param Environment = 'D'
12+
13+
param DeploymentID = '1'
14+
15+
param Stage = {
16+
RG: 1
17+
RBAC: 1
18+
PIM: 0
19+
UAI: 1
20+
SP: 0
21+
KV: 0
22+
DDOSPlan: 0
23+
OMS: 1
24+
OMSSolutions: 0
25+
OMSDataSources: 0
26+
OMSUpdateWeekly: 0
27+
OMSUpdateMonthly: 0
28+
OMSUpates: 0
29+
SA: 1
30+
ACR: 0
31+
CDN: 0
32+
StorageSync: 0
33+
RSV: 0
34+
NSG: 1
35+
NetworkWatcher: 0
36+
FlowLogs: 1
37+
VNet: 1
38+
VNetDDOS: 0
39+
VNetPeering: 1
40+
DNSPublicZone: 0
41+
DNSPrivateZone: 0
42+
LinkPrivateDns: 0
43+
PrivateLink: 0
44+
BastionHost: 0
45+
CloudShellRelay: 0
46+
RT: 0
47+
FW: 0
48+
VNGW: 0
49+
NATGW: 1
50+
ERGW: 0
51+
LB: 0
52+
TM: 0
53+
WAFPOLICY: 0
54+
WAF: 0
55+
FRONTDOORPOLICY: 0
56+
FRONTDOOR: 0
57+
SetExternalDNS: 0
58+
SetInternalDNS: 0
59+
APPCONFIG: 0
60+
REDIS: 0
61+
APIM: 0
62+
SQLMI: 0
63+
CosmosDB: 0
64+
DASHBOARD: 0
65+
ServerFarm: 0
66+
WebSite: 0
67+
WebSiteContainer: 0
68+
ManagedEnv: 0
69+
ContainerApp: 0
70+
MySQLDB: 0
71+
Function: 0
72+
SB: 0
73+
LT: 0
74+
AzureSYN: 0
75+
AVDHostPool: 1
76+
AVDHostAppGroup: 1
77+
AVDHostWorkSpace: 1
78+
// below require secrets from KV
79+
VMSS: 0
80+
ACI: 0
81+
AKS: 0
82+
AzureSQL: 0
83+
SFM: 0
84+
SFMNP: 0
85+
AVD: 1
86+
// VM templates
87+
ADPrimary: 0
88+
ADSecondary: 0
89+
InitialDOP: 0
90+
VMApp: 1
91+
VMSQL: 0
92+
VMFILE: 0
93+
}
94+
95+
param Extensions = {
96+
MonitoringAgent: 0
97+
IaaSDiagnostics: 1
98+
DependencyAgent: 1
99+
AzureMonitorAgent: 1
100+
GuestHealthAgent: 0
101+
VMInsights: 1
102+
AdminCenter: 0
103+
BackupWindowsWorkloadSQL: 0
104+
DSC: 1
105+
GuestConfig: 0
106+
Scripts: 0
107+
MSI: 0
108+
CertMgmt: 0
109+
DomainJoin: 0
110+
AADLogin: 1
111+
Antimalware: 1
112+
VMSSAzureADEnabled: 0
113+
SqlIaasExtension: 0
114+
AzureDefender: 0
115+
GuestAttestation: 1
116+
}
117+
118+
param DeploymentInfo = {
119+
uaiInfo: [
120+
// {
121+
// name: 'KeyVaultSecretsGet'
122+
// RBAC: [
123+
// {
124+
// Name: 'Key Vault Secrets User'
125+
// }
126+
// ]
127+
// }
128+
{
129+
name: 'Automation'
130+
RBAC: [
131+
{
132+
Name: 'Key Vault Secrets User'
133+
}
134+
{
135+
Name: 'Storage Account Contributor'
136+
}
137+
{
138+
Name: 'Storage Queue Data Contributor'
139+
}
140+
{
141+
Name: 'Storage Blob Data Owner'
142+
}
143+
]
144+
}
145+
{
146+
name: 'StorageAccountFileContributor'
147+
RBAC: [
148+
{
149+
Name: 'Desktop Virtualization Reader'
150+
}
151+
{
152+
Name: 'Storage File Data SMB Share Contributor'
153+
RG: 'G1'
154+
Tenant: 'HUB'
155+
OrgName: 'PE'
156+
Prefix: 'AEU1'
157+
}
158+
{
159+
Name: 'Storage Blob Data Contributor'
160+
RG: 'G1'
161+
Tenant: 'HUB'
162+
OrgName: 'PE'
163+
Prefix: 'AEU1'
164+
}
165+
{
166+
Name: 'Storage Queue Data Contributor'
167+
RG: 'G1'
168+
Tenant: 'HUB'
169+
OrgName: 'PE'
170+
Prefix: 'AEU1'
171+
}
172+
]
173+
}
174+
]
175+
PIMInfo: []
176+
rolesInfo: [
177+
{
178+
Name: 'brwilkinson'
179+
RBAC: [
180+
{
181+
Name: 'Virtual Machine User Login'
182+
}
183+
]
184+
}
185+
{
186+
Name: 'BenWilkinson-ADM'
187+
RBAC: [
188+
{
189+
Name: 'Reader'
190+
}
191+
{
192+
Name: 'Contributor'
193+
}
194+
{
195+
Name: 'Virtual Machine Administrator Login'
196+
}
197+
{
198+
Name: 'Virtual Machine User Login'
199+
}
200+
]
201+
}
202+
]
203+
SPInfo: []
204+
SubnetInfo: [
205+
{
206+
name: 'snFE01'
207+
prefix: '0/26'
208+
NSG: 1
209+
Route: 0
210+
FlowLogEnabled: 1
211+
FlowAnalyticsEnabled: 1
212+
NGW: 1
213+
}
214+
]
215+
NatGWInfo: [
216+
{
217+
Name: 'NAT01'
218+
PIPCount: 1
219+
}
220+
]
221+
OMSSolutions: [
222+
'Security'
223+
'ChangeTracking'
224+
'AzureActivity'
225+
'AlertManagement'
226+
'SecurityInsights'
227+
// 'KeyVaultAnalytics'
228+
'NetworkMonitoring'
229+
'InfrastructureInsights'
230+
'VMInsights'
231+
'WindowsDefenderATP'
232+
'BehaviorAnalyticsInsights'
233+
]
234+
KVInfo: [
235+
{
236+
Name: 'VLT01'
237+
skuName: 'standard'
238+
softDelete: true
239+
PurgeProtection: true
240+
RbacAuthorization: true
241+
allNetworks: 1
242+
_PrivateLinkInfo: [
243+
{
244+
Subnet: 'snMT02'
245+
groupID: 'vault'
246+
}
247+
]
248+
}
249+
]
250+
saInfo: [
251+
{
252+
name: 'diag'
253+
skuName: 'Standard_LRS'
254+
allNetworks: 0
255+
logging: {
256+
r: 0
257+
w: 0
258+
d: 1
259+
}
260+
blobVersioning: 1
261+
changeFeed: 1
262+
softDeletePolicy: {
263+
enabled: 1
264+
days: 7
265+
}
266+
}
267+
]
268+
AVDHostPoolInfo: [
269+
{
270+
Name: 'CLIENT01'
271+
Description: 'Test pool CLIENT'
272+
}
273+
]
274+
AVDAppGroupInfo: [
275+
{
276+
Name: 'Desktop01'
277+
Description: 'Test pool CLIENT'
278+
Kind: 'Desktop'
279+
HostPoolName: 'CLIENT01'
280+
description: 'Desktop Application Group'
281+
friendlyName: 'Default Desktop'
282+
DesktopVirtualizationUser: [
283+
// 'brwilkinson'
284+
]
285+
}
286+
{
287+
Name: 'WebApp01'
288+
Description: 'WebApp'
289+
Kind: 'RemoteApp'
290+
HostPoolName: 'CLIENT01'
291+
description: 'WebApp'
292+
friendlyName: 'WebAppEdge'
293+
DesktopVirtualizationUser: [
294+
'brwilkinson'
295+
]
296+
Applications: [
297+
{
298+
description: 'WebApp'
299+
friendlyName: 'Web App - EastUS'
300+
filePath: 'C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe'
301+
commandLineSetting: 'Require'
302+
commandLineArguments: 'https://portal.azure.com'
303+
showInPortal: true
304+
iconPath: 'C:\\source\\avd\\favicon.ico'
305+
iconIndex: 0
306+
applicationType: 'Inbuilt'
307+
}
308+
]
309+
}
310+
]
311+
AVDWorkspaceInfo: [
312+
{
313+
Name: 'CLIENT01'
314+
AppGroupName: [
315+
'Desktop01'
316+
'WebApp01'
317+
]
318+
Description: 'WebApp Workspace'
319+
description: 'WebApp Workspace'
320+
friendlyName: 'WebApp Workspace'
321+
publicNetworkAccess: 'Enabled'
322+
}
323+
]
324+
Appservers: {
325+
AppServers: [
326+
{
327+
Name: 'CLIENT01'
328+
Role: 'AVD'
329+
OSType: 'Win11AVD02'
330+
HotPatch: true
331+
intune: 1
332+
Zone: 1
333+
NICs: [
334+
{
335+
Subnet: 'snFE01'
336+
Primary: 1
337+
}
338+
]
339+
}
340+
{
341+
Name: 'CLIENT02'
342+
Role: 'AVD'
343+
OSType: 'Win11AVD02'
344+
HotPatch: true
345+
intune: 1
346+
Zone: 3
347+
NICs: [
348+
{
349+
Subnet: 'snFE01'
350+
Primary: 1
351+
}
352+
]
353+
}
354+
]
355+
}
356+
}

‎ADF/tenants/AVD/Global-AEU1.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"Global": {
3+
"hubRG": {
4+
"name": "P0",
5+
"AppName": "HUB"
6+
},
7+
"hubKV": {
8+
"name": "VLT01",
9+
"AppName": "HUB"
10+
},
11+
"hubAA": {
12+
"name": "OMSAutomation"
13+
},
14+
"DNSServers": [
15+
// "10.182.248.4"
16+
],
17+
"AALocation": "EastUS",
18+
"RTName": "Hub",
19+
"schedulerTimeZone": "Eastern Standard Time",
20+
"patchSchedulerTimeZone": "America/New_York",
21+
"locationFriendly": "EASTUS"
22+
}
23+
}

0 commit comments

Comments
 (0)