Skip to content

Commit 7e190c3

Browse files
vikasnavvikasnav
committed
Revert "Adding RDS"
This reverts commit fa8caec.
1 parent fa8caec commit 7e190c3

File tree

10 files changed

+901
-132
lines changed

10 files changed

+901
-132
lines changed

‎rds-deployment-customimage-rdsh/azuredeploy.json‎

Lines changed: 36 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@
1313
"type": "string",
1414
"metadata": {
1515
"description": "The name of the administrator of the new VM and the domain. Exclusion list: 'administrator'. For example johnadmin"
16-
},
17-
"defaultValue": "vmadmin"
16+
}
1817
},
1918
"adminPassword": {
2019
"type": "securestring",
2120
"metadata": {
2221
"description": "The password for the administrator account of the new VM and the domain"
23-
},
24-
"defaultValue": "[concat('Subscription#',subscription().subscriptionId)]"
22+
}
2523
},
2624
"imageSKU": {
2725
"type": "string",
@@ -34,7 +32,7 @@
3432
},
3533
"defaultValue": "2012-R2-Datacenter"
3634
},
37-
"rdshImageStorageAccountName": {
35+
"rdshImageStorageAccountName": {
3836
"type": "string",
3937
"metadata": {
4038
"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"
@@ -46,64 +44,39 @@
4644
"description": "The URI for source of the blob containing the custom image. For example https://johnrdshstore.blob.core.windows.net/johncontainer/MyWindowServerOS.vhd"
4745
}
4846
},
49-
"NumberOfRemoteDesktopSessionHosts": {
47+
"numberOfRdshInstances": {
5048
"type": "int",
5149
"defaultValue": 1,
5250
"metadata": {
53-
"description": "Number of RemoteDesktopSessionHosts"
51+
"description": "Number of RDSH instances"
5452
}
5553
}
5654
},
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-
},
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+
},
7875
"resources": [
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-
{
76+
{
10477
"apiVersion": "[variables('apiVersionNRP')]",
10578
"type": "Microsoft.Network/publicIPAddresses",
106-
"name": "[variables('brokerIpRef')]",
79+
"name": "[variables('publicIpRef')]",
10780
"location": "[resourceGroup().location]",
10881
"properties": {
10982
"publicIPAllocationMethod": "Dynamic",
@@ -205,9 +178,6 @@
205178
"name": "ipconfig",
206179
"properties": {
207180
"privateIPAllocationMethod": "Dynamic",
208-
"publicIPAddress": {
209-
"id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('gatewayIpRef'))]"
210-
},
211181
"subnet": {
212182
"id": "[variables('subnet-id')]"
213183
},
@@ -229,7 +199,8 @@
229199
],
230200
"dnsSettings": {
231201
"dnsServers": [
232-
"[variables('dnsServerPrivateIp')]"
202+
"[variables('dnsServerPrivateIp')]",
203+
"[variables('DNSIP')]"
233204
]
234205
}
235206
}
@@ -248,9 +219,6 @@
248219
"name": "ipconfig",
249220
"properties": {
250221
"privateIPAllocationMethod": "Dynamic",
251-
"publicIPAddress": {
252-
"id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('brokerIpRef'))]"
253-
},
254222
"subnet": {
255223
"id": "[variables('subnet-id')]"
256224
}
@@ -259,7 +227,8 @@
259227
],
260228
"dnsSettings": {
261229
"dnsServers": [
262-
"[variables('dnsServerPrivateIp')]"
230+
"[variables('dnsServerPrivateIp')]",
231+
"[variables('DNSIP')]"
263232
]
264233
}
265234
}
@@ -271,7 +240,7 @@
271240
"location": "[resourceGroup().location]",
272241
"copy": {
273242
"name": "rdsh-nic-loop",
274-
"count": "[parameters('NumberOfRemoteDesktopSessionHosts')]"
243+
"count": "[parameters('numberOfRdshInstances')]"
275244
},
276245
"dependsOn": [
277246
"Microsoft.Network/loadBalancers/loadBalancer"
@@ -290,7 +259,8 @@
290259
],
291260
"dnsSettings": {
292261
"dnsServers": [
293-
"[variables('dnsServerPrivateIp')]"
262+
"[variables('dnsServerPrivateIp')]",
263+
"[variables('DNSIP')]"
294264
]
295265
}
296266
}
@@ -382,7 +352,7 @@
382352
"location": "[resourceGroup().location]",
383353
"copy": {
384354
"name": "rdsh-vm-loop",
385-
"count": "[parameters('NumberOfRemoteDesktopSessionHosts')]"
355+
"count": "[parameters('numberOfRdshInstances')]"
386356
},
387357
"dependsOn": [
388358
"Microsoft.Compute/virtualMachines/gw-vm/extensions/gateway",
@@ -538,7 +508,7 @@
538508
"connectionBroker": "[concat('broker.',parameters('adDomainName'))]",
539509
"domainName": "[parameters('adDomainName')]",
540510
"externalfqdn": "[concat('gateway.',parameters('adDomainName'))]",
541-
"NumberOfRemoteDesktopSessionHosts": "[parameters('NumberOfRemoteDesktopSessionHosts')]",
511+
"numberOfRdshInstances": "[parameters('numberOfRdshInstances')]",
542512
"sessionHostNamingPrefix": "rdsh-",
543513
"webAccessServer": "[concat('gateway.',parameters('adDomainName'))]"
544514
}

‎rds-deployment-customimage-rdsh/azuredeploy.parameters.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,26 @@
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"adminPassword": {
6+
"value": "GEN-PASSWORD"
7+
},
8+
"adminUsername": {
9+
"value": "azureUser"
10+
},
11+
"adDomainName": {
12+
"value": "mydomain.local"
13+
},
514
"rdshImageStorageAccountName": {
615
"value": "my-rdsh-image-storage-name"
716
},
817
"rdshsourceImageVhdUri": {
918
"value": "rdsh-source-image-uri"
19+
},
20+
"numberOfRdshInstances": {
21+
"value": 1
22+
},
23+
"imageSKU": {
24+
"value": "2012-R2-Datacenter"
1025
}
1126
}
1227
}

‎rds-deployment-existing-ad/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ This template will create a Remote Desktop Sesson Collection farm using the Powe
1212

1313
+ Login into Azurestack portal
1414
+ Click "New" -> "Custom" -> "Template deployment"
15-
+ Deploy ad-non-ha template. if you already have deployed ad-non-ha, then you can use that AD deployment by its resource group for this deployment.
1615
+ Copy conent in azuredeploy.json, Click "Edit Tempalte" and paste content, then Click "Save"
1716
+ Fill the parameters. Again, this uses existing AD. Please see note above.
1817
+ Click "Create new" to create new Resource Group

0 commit comments

Comments
 (0)