|
13 | 13 | "type": "string", |
14 | 14 | "metadata": { |
15 | 15 | "description": "The name of the administrator of the new VM and the domain. Exclusion list: 'administrator'. For example johnadmin" |
16 | | - } |
| 16 | + }, |
| 17 | + "defaultValue": "vmadmin" |
17 | 18 | }, |
18 | 19 | "adminPassword": { |
19 | 20 | "type": "securestring", |
20 | 21 | "metadata": { |
21 | 22 | "description": "The password for the administrator account of the new VM and the domain" |
22 | | - } |
| 23 | + }, |
| 24 | + "defaultValue": "[concat('Subscription#',subscription().subscriptionId)]" |
23 | 25 | }, |
24 | 26 | "imageSKU": { |
25 | 27 | "type": "string", |
|
32 | 34 | }, |
33 | 35 | "defaultValue": "2012-R2-Datacenter" |
34 | 36 | }, |
35 | | - "rdshImageStorageAccountName": { |
| 37 | + "rdshImageStorageAccountName": { |
36 | 38 | "type": "string", |
37 | 39 | "metadata": { |
38 | 40 | "description": "This is the name of the your storage account where you stored the os custom image you want to use for rdsh machines. For example johnrdshstore" |
|
44 | 46 | "description": "The URI for source of the blob containing the custom image. For example https://johnrdshstore.blob.core.windows.net/johncontainer/MyWindowServerOS.vhd" |
45 | 47 | } |
46 | 48 | }, |
47 | | - "numberOfRdshInstances": { |
| 49 | + "NumberOfRemoteDesktopSessionHosts": { |
48 | 50 | "type": "int", |
49 | 51 | "defaultValue": 1, |
50 | 52 | "metadata": { |
51 | | - "description": "Number of RDSH instances" |
| 53 | + "description": "Number of RemoteDesktopSessionHosts" |
52 | 54 | } |
53 | 55 | } |
54 | 56 | }, |
55 | | - "variables": { |
56 | | - "dnsLabelPrefix": "[concat('dns', resourceGroup().name)]", |
57 | | - "rdshVmSize": "Standard_A2", |
58 | | - "storageAccountName": "[concat('sa', resourceGroup().name)]", |
59 | | - "storageAccountType": "Standard_LRS", |
60 | | - "uniqueStorageAccountContainerName": "[concat('sc', resourceGroup().name)]", |
61 | | - "imagePublisher": "MicrosoftWindowsServer", |
62 | | - "imageOffer": "WindowsServer", |
63 | | - "adVnetName": "[concat('ADVNET',resourceGroup().name)]", |
64 | | - "adSubnetName": "[concat('ADStaticSubnet',resourceGroup().name)]", |
65 | | - "vnetAddressRange": "10.0.0.0/16", |
66 | | - "subnetAddressRange": "10.0.0.0/24", |
67 | | - "dnsServerPrivateIp": "10.0.0.4", |
68 | | - "DNSIP": "192.168.100.2", |
69 | | - "subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',variables('adVnetName')),'/subnets/',variables('adSubnetName'))]", |
70 | | - "publicIpRef": "publicIp", |
71 | | - "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/rds-deployment/", |
72 | | - "apiVersion": "2015-06-15", |
73 | | - "apiVersionNRP": "2015-05-01-preview" |
74 | | - }, |
| 57 | + "variables": { |
| 58 | + "dnsLabelPrefix": "[concat('dns', resourceGroup().name)]", |
| 59 | + "rdshVmSize": "Standard_A2", |
| 60 | + "storageAccountName": "[concat('sa', resourceGroup().name)]", |
| 61 | + "storageAccountType": "Standard_LRS", |
| 62 | + "uniqueStorageAccountContainerName": "[concat('sc', resourceGroup().name)]", |
| 63 | + "imagePublisher": "MicrosoftWindowsServer", |
| 64 | + "imageOffer": "WindowsServer", |
| 65 | + "adVnetName": "[concat('ADVNET',resourceGroup().name)]", |
| 66 | + "adSubnetName": "[concat('ADStaticSubnet',resourceGroup().name)]", |
| 67 | + "vnetAddressRange": "10.0.0.0/16", |
| 68 | + "subnetAddressRange": "10.0.0.0/24", |
| 69 | + "dnsServerPrivateIp": "10.0.0.4", |
| 70 | + "subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',variables('adVnetName')),'/subnets/',variables('adSubnetName'))]", |
| 71 | + "publicIpRef": "publicIp", |
| 72 | + "brokerIpRef": "brokerpublicIp", |
| 73 | + "gatewayIpRef": "gatewaypublicIp", |
| 74 | + "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/develop/rds-deployment-existing-ad/", |
| 75 | + "apiVersion": "2015-06-15", |
| 76 | + "apiVersionNRP": "2015-06-15" |
| 77 | + }, |
75 | 78 | "resources": [ |
76 | | - { |
| 79 | + { |
| 80 | + "apiVersion": "[variables('apiVersionNRP')]", |
| 81 | + "type": "Microsoft.Network/publicIPAddresses", |
| 82 | + "name": "[variables('publicIpRef')]", |
| 83 | + "location": "[resourceGroup().location]", |
| 84 | + "properties": { |
| 85 | + "publicIPAllocationMethod": "Dynamic", |
| 86 | + "dnsSettings": { |
| 87 | + "domainNameLabel": "[variables('dnsLabelPrefix')]" |
| 88 | + } |
| 89 | + } |
| 90 | + }, |
| 91 | + { |
| 92 | + "apiVersion": "[variables('apiVersionNRP')]", |
| 93 | + "type": "Microsoft.Network/publicIPAddresses", |
| 94 | + "name": "[variables('gatewayIpRef')]", |
| 95 | + "location": "[resourceGroup().location]", |
| 96 | + "properties": { |
| 97 | + "publicIPAllocationMethod": "Dynamic", |
| 98 | + "dnsSettings": { |
| 99 | + "domainNameLabel": "[variables('dnsLabelPrefix')]" |
| 100 | + } |
| 101 | + } |
| 102 | + }, |
| 103 | + { |
77 | 104 | "apiVersion": "[variables('apiVersionNRP')]", |
78 | 105 | "type": "Microsoft.Network/publicIPAddresses", |
79 | | - "name": "[variables('publicIpRef')]", |
| 106 | + "name": "[variables('brokerIpRef')]", |
80 | 107 | "location": "[resourceGroup().location]", |
81 | 108 | "properties": { |
82 | 109 | "publicIPAllocationMethod": "Dynamic", |
|
178 | 205 | "name": "ipconfig", |
179 | 206 | "properties": { |
180 | 207 | "privateIPAllocationMethod": "Dynamic", |
| 208 | + "publicIPAddress": { |
| 209 | + "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('gatewayIpRef'))]" |
| 210 | + }, |
181 | 211 | "subnet": { |
182 | 212 | "id": "[variables('subnet-id')]" |
183 | 213 | }, |
|
199 | 229 | ], |
200 | 230 | "dnsSettings": { |
201 | 231 | "dnsServers": [ |
202 | | - "[variables('dnsServerPrivateIp')]", |
203 | | - "[variables('DNSIP')]" |
| 232 | + "[variables('dnsServerPrivateIp')]" |
204 | 233 | ] |
205 | 234 | } |
206 | 235 | } |
|
219 | 248 | "name": "ipconfig", |
220 | 249 | "properties": { |
221 | 250 | "privateIPAllocationMethod": "Dynamic", |
| 251 | + "publicIPAddress": { |
| 252 | + "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('brokerIpRef'))]" |
| 253 | + }, |
222 | 254 | "subnet": { |
223 | 255 | "id": "[variables('subnet-id')]" |
224 | 256 | } |
|
227 | 259 | ], |
228 | 260 | "dnsSettings": { |
229 | 261 | "dnsServers": [ |
230 | | - "[variables('dnsServerPrivateIp')]", |
231 | | - "[variables('DNSIP')]" |
| 262 | + "[variables('dnsServerPrivateIp')]" |
232 | 263 | ] |
233 | 264 | } |
234 | 265 | } |
|
240 | 271 | "location": "[resourceGroup().location]", |
241 | 272 | "copy": { |
242 | 273 | "name": "rdsh-nic-loop", |
243 | | - "count": "[parameters('numberOfRdshInstances')]" |
| 274 | + "count": "[parameters('NumberOfRemoteDesktopSessionHosts')]" |
244 | 275 | }, |
245 | 276 | "dependsOn": [ |
246 | 277 | "Microsoft.Network/loadBalancers/loadBalancer" |
|
259 | 290 | ], |
260 | 291 | "dnsSettings": { |
261 | 292 | "dnsServers": [ |
262 | | - "[variables('dnsServerPrivateIp')]", |
263 | | - "[variables('DNSIP')]" |
| 293 | + "[variables('dnsServerPrivateIp')]" |
264 | 294 | ] |
265 | 295 | } |
266 | 296 | } |
|
352 | 382 | "location": "[resourceGroup().location]", |
353 | 383 | "copy": { |
354 | 384 | "name": "rdsh-vm-loop", |
355 | | - "count": "[parameters('numberOfRdshInstances')]" |
| 385 | + "count": "[parameters('NumberOfRemoteDesktopSessionHosts')]" |
356 | 386 | }, |
357 | 387 | "dependsOn": [ |
358 | 388 | "Microsoft.Compute/virtualMachines/gw-vm/extensions/gateway", |
|
508 | 538 | "connectionBroker": "[concat('broker.',parameters('adDomainName'))]", |
509 | 539 | "domainName": "[parameters('adDomainName')]", |
510 | 540 | "externalfqdn": "[concat('gateway.',parameters('adDomainName'))]", |
511 | | - "numberOfRdshInstances": "[parameters('numberOfRdshInstances')]", |
| 541 | + "NumberOfRemoteDesktopSessionHosts": "[parameters('NumberOfRemoteDesktopSessionHosts')]", |
512 | 542 | "sessionHostNamingPrefix": "rdsh-", |
513 | 543 | "webAccessServer": "[concat('gateway.',parameters('adDomainName'))]" |
514 | 544 | } |
|
0 commit comments