Skip to content

Commit ba55a0f

Browse files
ttw2001ttw2001
authored
Merge pull request #99 from Azure/revert-95-master
Revert #95 to keep master at AzureStackTechnicalPreview1
2 parents b1187e2 + ede0b93 commit ba55a0f

File tree

2 files changed

+128
-82
lines changed

2 files changed

+128
-82
lines changed

‎201-Comprehensive/azuredeploy.json‎

Lines changed: 122 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,37 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"adminUsername": {
6-
"type": "String",
6+
"type": "string",
77
"metadata": {
88
"description": "The name of the Administrator of the new VMs"
99
},
10-
"defaultValue": "vmadmin"
10+
"defaultValue": "lcladmin"
1111
},
1212
"adminPassword": {
13-
"type": "SecureString",
13+
"type": "securestring",
1414
"metadata": {
1515
"description": "The password for the Administrator account of the new VMs. Default value is subscription id"
1616
},
17-
"defaultValue": "[concat('Subscription#',subscription().subscriptionId)]"
17+
"defaultValue": "[substring(resourcegroup().id,15,36)]"
18+
},
19+
"dnsServer": {
20+
"type": "string",
21+
"metadata": {
22+
"description": "The DNS server IP address for VM internet connectivity"
23+
},
24+
"defaultValue": "192.168.200.3",
25+
"allowedValues": [
26+
"192.168.200.3",
27+
"192.168.100.2",
28+
""
29+
]
1830
}
1931
},
2032
"variables": {
2133
"storageAccountType": "Standard_LRS",
22-
"vmName": "[tolower(concat('vm', resourceGroup().name))]",
34+
"vmName": "[concat('CVM', resourceGroup().name)]",
2335
"VMSize": "Standard_A2",
24-
"dnsPrefix": "[tolower(concat('vmdns', resourceGroup().name))]",
36+
"dnsPrefix": "[concat('CVM', resourceGroup().name)]",
2537
"vmNetworkSubnet": "10.0.0.0/24",
2638
"virtualNetworkAddressRange": "10.0.0.0/16",
2739
"primaryAdIpAddress": "10.0.0.4",
@@ -31,7 +43,7 @@
3143
"windowsImageVersion": "latest",
3244
"dataDiskSize": 2,
3345
"assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/201-Comprehensive",
34-
"staticSubnetName": "vmstaticsubnet",
46+
"staticSubnetName": "CVMStaticSubnet",
3547
"subnets": [
3648
{
3749
"name": "[variables('staticSubnetName')]",
@@ -43,33 +55,36 @@
4355
}
4456
}
4557
],
46-
"virtualNetworkName": "[tolower(concat('vmvnet',resourceGroup().name))]",
58+
"virtualNetworkName": "[concat('CVMNet',resourceGroup().name)]",
4759
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
4860
"staticSubnetRef": "[concat(variables('vnetID'),'/subnets/',variables('staticSubnetName'))]",
4961
"adTemplateURL": "[concat(variables('assetLocation'),'/adVmTemplate.json')]",
50-
"storageName": "[tolower(concat('vmsa', resourceGroup().name))]",
51-
"publicLBName": "[tolower(concat('vmplb', resourceGroup().name))]",
52-
"publicIPAddressName": "[tolower(concat('vmpip',resourceGroup().name))]",
53-
"lbFE": "[tolower(concat('vmlbfe',resourceGroup().name))]",
54-
"lbBE": "[tolower(concat('vmlbbe',resourceGroup().name))]",
55-
"rpdNAT": "[tolower(concat('vmrdpnat',resourceGroup().name))]",
62+
"storageName": "[tolower(concat('CVMSA', resourceGroup().name))]",
63+
"publicLBName": "[concat('CVMPLB', resourceGroup().name)]",
64+
"publicIPAddressName": "[concat('CVMPIP',resourceGroup().name)]",
65+
"lbFE": "[concat('CVMLBFE',resourceGroup().name)]",
66+
"lbBE": "[concat('CVMLBBE',resourceGroup().name)]",
67+
"rpdNAT": "[concat('CVMRDPNAT',resourceGroup().name)]",
5668
"publiclbID": "[resourceId('Microsoft.Network/loadBalancers',variables('publicLBName'))]",
5769
"publiclbFEConfigID": "[concat(variables('publiclbID'),'/frontendIPConfigurations/',variables('lbFE'))]",
5870
"rdpPort": 3389,
5971
"publicBEAddressPoolID": "[concat(variables('publiclbID'),'/backendAddressPools/',variables('lbBE'))]",
6072
"rDPNATRuleID": "[concat(variables('publiclbID'),'/inboundNatRules/',variables('rpdNAT'))]",
61-
"nsgName": "[tolower(concat('vmnsg',resourceGroup().name))]",
73+
"nsgName": "[concat('CVMNsg',resourceGroup().name)]",
6274
"nsgID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('nsgName'))]",
75+
"azureStackDNSIP": "[parameters('dnsServer')]",
6376
"apiVersion": {
6477
"resources": {
6578
"deployments": "2015-01-01"
6679
},
67-
"network": "2015-06-15",
68-
"storage": "2015-06-15",
80+
"network": "2015-05-01-preview",
81+
"storage": "2015-05-01-preview",
6982
"compute": "2015-06-15"
7083
},
71-
"NICPrefix": "[tolower(concat('vmnic', resourceGroup().name))]",
84+
"NICPrefix": "[concat('NIC', resourceGroup().name)]",
7285
"vmContainerName": "vhds",
86+
"storageAccountTemplateURL": "[concat(variables('assetLocation'),'/storageAccount.json')]",
87+
"StorageAccountInfoDeployment": "StorageAccountInfoDeployment",
7388
"WindowsFeatureName": "Web-Server",
7489
"ModulesURL": "[concat(variables('assetLocation'),'/windowsFeature.zip')]",
7590
"ConfigurationFunction": "windowsFeature.ps1\\EnalbeWindowsFeature",
@@ -78,10 +93,10 @@
7893
},
7994
"resources": [
8095
{
81-
"type": "Microsoft.Network/networkSecurityGroups",
8296
"name": "[variables('nsgName')]",
83-
"apiVersion": "[variables('apiVersion').network]",
97+
"type": "Microsoft.Network/networkSecurityGroups",
8498
"location": "[resourceGroup().location]",
99+
"apiVersion": "[variables('apiVersion').network]",
85100
"properties": {
86101
"securityRules": [
87102
{
@@ -101,10 +116,13 @@
101116
}
102117
},
103118
{
104-
"type": "Microsoft.Network/virtualNetworks",
105119
"name": "[variables('virtualNetworkName')]",
106-
"apiVersion": "[variables('apiVersion').network]",
120+
"type": "Microsoft.Network/virtualNetworks",
107121
"location": "[resourceGroup().location]",
122+
"apiVersion": "[variables('apiVersion').network]",
123+
"dependsOn": [
124+
"[variables('nsgID')]"
125+
],
108126
"properties": {
109127
"addressSpace": {
110128
"addressPrefixes": [
@@ -121,32 +139,37 @@
121139
}
122140
}
123141
}
124-
]
125-
},
126-
"dependsOn": [
127-
"[variables('nsgID')]"
128-
]
142+
],
143+
"dhcpOptions": {
144+
"dnsServers": [
145+
"[variables('azureStackDNSIP')]"
146+
]
147+
}
148+
}
129149
},
130150
{
131-
"type": "Microsoft.Network/publicIPAddresses",
132151
"name": "[variables('publicIPAddressName')]",
133-
"apiVersion": "[variables('apiVersion').network]",
152+
"type": "Microsoft.Network/publicIPAddresses",
134153
"location": "[resourceGroup().location]",
154+
"apiVersion": "[variables('apiVersion').network]",
155+
"dependsOn": [
156+
"[variables('vnetID')]"
157+
],
135158
"properties": {
136159
"publicIPAllocationMethod": "Dynamic",
137160
"dnsSettings": {
138161
"domainNameLabel": "[variables('dnsPrefix')]"
139162
}
140-
},
141-
"dependsOn": [
142-
"[variables('vnetID')]"
143-
]
163+
}
144164
},
145165
{
146-
"type": "Microsoft.Network/loadBalancers",
147166
"name": "[variables('publiclbName')]",
148-
"apiVersion": "[variables('apiVersion').network]",
167+
"type": "Microsoft.Network/loadBalancers",
149168
"location": "[resourceGroup().location]",
169+
"apiVersion": "[variables('apiVersion').network]",
170+
"dependsOn": [
171+
"[variables('publicIPAddressName')]"
172+
],
150173
"properties": {
151174
"frontendIPConfigurations": [
152175
{
@@ -172,28 +195,29 @@
172195
}
173196
}
174197
]
175-
},
176-
"dependsOn": [
177-
"[variables('publicIPAddressName')]"
178-
]
198+
}
179199
},
180200
{
181-
"type": "Microsoft.Storage/storageAccounts",
182201
"name": "[variables('storageName')]",
183-
"apiVersion": "[variables('apiVersion').storage]",
202+
"type": "Microsoft.Storage/storageAccounts",
184203
"location": "[resourceGroup().location]",
185-
"properties": {
186-
"accountType": "[variables('storageAccountType')]"
187-
},
204+
"apiVersion": "[variables('apiVersion').storage]",
188205
"dependsOn": [
189206
"[variables('publiclbName')]"
190-
]
207+
],
208+
"properties": {
209+
"accountType": "[variables('storageAccountType')]"
210+
}
191211
},
192212
{
193-
"type": "Microsoft.Network/networkInterfaces",
194213
"name": "[concat(variables('NICPrefix'), '0')]",
195-
"apiVersion": "[variables('apiVersion').network]",
214+
"type": "Microsoft.Network/networkInterfaces",
196215
"location": "[resourceGroup().location]",
216+
"dependsOn": [
217+
"[variables('vnetID')]",
218+
"[variables('publiclbName')]"
219+
],
220+
"apiVersion": "[variables('apiVersion').network]",
197221
"properties": {
198222
"ipConfigurations": [
199223
{
@@ -211,17 +235,17 @@
211235
}
212236
}
213237
]
214-
},
215-
"dependsOn": [
216-
"[variables('vnetID')]",
217-
"[variables('publiclbName')]"
218-
]
238+
}
219239
},
220240
{
221-
"type": "Microsoft.Network/networkInterfaces",
222241
"name": "[concat(variables('NICPrefix'), '1')]",
223-
"apiVersion": "[variables('apiVersion').network]",
242+
"type": "Microsoft.Network/networkInterfaces",
224243
"location": "[resourceGroup().location]",
244+
"dependsOn": [
245+
"[variables('vnetID')]",
246+
"[variables('publiclbName')]"
247+
],
248+
"apiVersion": "[variables('apiVersion').network]",
225249
"properties": {
226250
"ipConfigurations": [
227251
{
@@ -234,17 +258,38 @@
234258
}
235259
}
236260
]
237-
},
261+
}
262+
},
263+
{
264+
"name": "[variables('StorageAccountInfoDeployment')]",
265+
"type": "Microsoft.Resources/deployments",
266+
"apiVersion": "[variables('apiVersion').resources.deployments]",
238267
"dependsOn": [
239-
"[variables('vnetID')]",
240-
"[variables('publiclbName')]"
241-
]
268+
"[resourceId('Microsoft.Storage/storageAccounts',variables('storageName'))]"
269+
],
270+
"properties": {
271+
"mode": "Incremental",
272+
"templateLink": {
273+
"uri": "[variables('storageAccountTemplateURL')]",
274+
"contentVersion": "1.0.0.0"
275+
},
276+
"parameters": {
277+
"storageAccountName": {
278+
"value": "[variables('storageName')]"
279+
}
280+
}
281+
}
242282
},
243283
{
244-
"type": "Microsoft.Compute/virtualMachines",
245284
"name": "[concat(variables('vmName'), '0')]",
246-
"apiVersion": "[variables('apiVersion').compute]",
285+
"type": "Microsoft.Compute/virtualMachines",
247286
"location": "[resourceGroup().location]",
287+
"apiVersion": "[variables('apiVersion').compute]",
288+
"dependsOn": [
289+
"[resourceId('Microsoft.Storage/storageAccounts',variables('storageName'))]",
290+
"[resourceId('Microsoft.Network/networkInterfaces',concat(variables('NICPrefix'), '0'))]",
291+
"[resourceId('Microsoft.Network/networkInterfaces',concat(variables('NICPrefix'), '1'))]"
292+
],
248293
"properties": {
249294
"hardwareProfile": {
250295
"vmSize": "[variables('vmSize')]"
@@ -272,7 +317,7 @@
272317
"dataDisks": [
273318
{
274319
"vhd": {
275-
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageName')),providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('vmContainerName'),'/', variables('vmName'), '0','data-1.vhd')]"
320+
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageName')),providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('vmName'), '0','data-1.vhd')]"
276321
},
277322
"name": "[concat(variables('vmName'), '0','-data-disk1')]",
278323
"createOption": "empty",
@@ -292,17 +337,16 @@
292337
}
293338
]
294339
}
295-
},
296-
"dependsOn": [
297-
"[resourceId('Microsoft.Network/networkInterfaces',concat(variables('NICPrefix'), '0'))]",
298-
"[resourceId('Microsoft.Network/networkInterfaces',concat(variables('NICPrefix'), '1'))]"
299-
]
340+
}
300341
},
301342
{
302343
"type": "Microsoft.Compute/virtualMachines/extensions",
303-
"name": "[concat(variables('vmName'), '0','/DSCExtension-EnableWindowsFeature')]",
344+
"name": "[concat(variables('vmName'), '0','/EnableWindowsFeature')]",
304345
"apiVersion": "[variables('apiVersion').compute]",
305346
"location": "[resourceGroup().location]",
347+
"dependsOn": [
348+
"[concat(variables('vmName'), '0')]"
349+
],
306350
"properties": {
307351
"publisher": "Microsoft.Powershell",
308352
"type": "DSC",
@@ -315,15 +359,15 @@
315359
"featureName": "[variables('WindowsFeatureName')]"
316360
}
317361
}
318-
},
319-
"dependsOn": [
320-
"[concat(variables('vmName'), '0')]"
321-
]
362+
}
322363
},
323364
{
324365
"type": "Microsoft.Compute/virtualMachines/extensions",
325-
"name": "[concat(variables('vmName'), '0','/BGInfoExtension')]",
366+
"name": "[concat(variables('vmName'), '0','/BGInfo')]",
326367
"apiVersion": "[variables('apiVersion').compute]",
368+
"dependsOn": [
369+
"[concat('Microsoft.Compute/virtualMachines/',variables('vmName'), '0','/extensions/EnableWindowsFeature')]"
370+
],
327371
"location": "[resourceGroup().location]",
328372
"properties": {
329373
"publisher": "Microsoft.Compute",
@@ -333,16 +377,16 @@
333377
"settings": {
334378
"Properties": [ ]
335379
}
336-
},
337-
"dependsOn": [
338-
"[concat('Microsoft.Compute/virtualMachines/',variables('vmName'), '0','/extensions/DSCExtension-EnableWindowsFeature')]"
339-
]
380+
}
340381
},
341382
{
342383
"type": "Microsoft.Compute/virtualMachines/extensions",
343-
"name": "[concat(variables('vmName'), '0','/CustomScriptExtension-VerifyWindowsFeature')]",
384+
"name": "[concat(variables('vmName'), '0','/CustomScriptExtension')]",
344385
"apiVersion": "[variables('apiVersion').compute]",
345386
"location": "[resourceGroup().location]",
387+
"dependsOn": [
388+
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), '0','/extensions/BGInfo')]"
389+
],
346390
"properties": {
347391
"publisher": "Microsoft.Compute",
348392
"type": "CustomScriptExtension",
@@ -354,12 +398,8 @@
354398
],
355399
"commandToExecute": "[concat('powershell -ExecutionPolicy Unrestricted -file ',variables('scriptFileName'), ' ', variables('WindowsFeatureName'))]"
356400
}
357-
},
358-
"dependsOn": [
359-
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), '0','/extensions/BGInfoExtension')]"
360-
]
401+
}
361402
}
362403
],
363404
"outputs": { }
364405
}
365-

‎201-Comprehensive/azuredeploy.parameters.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,11 @@
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"adminUsername": {
6+
"value": "lcladmin"
7+
},
8+
"adminPassword": {
9+
"value": "GEN-PASSWORD"
10+
}
511
}
612
}

0 commit comments

Comments
 (0)