Skip to content

Commit a3feed3

Browse files
srimathiSvikasnav
srimathiS
authored and
vikasnav
committed
Localdev (#143)
* remove 15.10 ubuntu version and inbound rule1 across all linux templates * reverting the RDP rule removal * Apiversion and unused variables fix
1 parent b6bc252 commit a3feed3

File tree

31 files changed

+193
-426
lines changed

31 files changed

+193
-426
lines changed

‎101-create-nsg/azuredeploy.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": { },
55
"variables": {
6-
"apiVersion": {
7-
"network": { "networkSecurityGroups": "2015-05-01-preview" }
8-
},
96
"networkSecurityGroupName": "mySG"
107
},
118
"resources": [
129
{
13-
"apiVersion": "[variables('apiVersion').network.networkSecurityGroups]",
10+
"apiVersion": "2015-05-01-preview",
1411
"type": "Microsoft.Network/networkSecurityGroups",
1512
"name": "[variables('networkSecurityGroupName')]",
1613
"location": "[resourceGroup().location]",

‎101-create-storage-account/azuredeploy.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
}
1111
},
1212
"variables": {
13-
"apiVersion": {
14-
"storage": { "storageAccounts": "2015-06-15" }
15-
},
1613
"storage": {
1714
"storageAccounts": {
1815
"name": "[replace(replace(tolower(parameters('storageAccountNamePrefix')), '-',''),'.','')]",
@@ -24,7 +21,7 @@
2421
{
2522
"type": "Microsoft.Storage/storageAccounts",
2623
"name": "[variables('storage').storageAccounts.name]",
27-
"apiVersion": "[variables('apiVersion').storage.storageAccounts]",
24+
"apiVersion": "2015-06-15",
2825
"location": "[resourceGroup().location]",
2926
"properties": {
3027
"accountType": "[variables('storage').storageAccounts.type]"

‎101-create-vnet-full/azuredeploy.json‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": { },
55
"variables": {
6-
"apiVersion": {
7-
"network": {
8-
"virtualNetworks": "2015-05-01-preview",
9-
"publicIPAddresses": "2015-05-01-preview",
10-
"networkSecurityGroups": "2015-05-01-preview",
11-
"networkInterfaces": "2015-05-01-preview"
12-
}
13-
},
146
"nicName": "myNic",
157
"publicIPAddressName": "myPubIP",
168
"vnetName": "myVNet",
@@ -21,14 +13,13 @@
2113
"subnetPrefix": "10.0.0.0/24",
2214
"publicIPAddressType": "Dynamic",
2315
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('vnetName'))]",
24-
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables ('subnetName'))]",
25-
"publicIPAddressID": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]",
16+
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables ('subnetName'))]",
2617
"numberOfInstances": 1,
2718
"dnsServer": "192.168.100.2"
2819
},
2920
"resources": [
3021
{
31-
"apiVersion": "[variables('apiVersion').network.networkSecurityGroups]",
22+
"apiVersion": "2015-05-01-preview",
3223
"type": "Microsoft.Network/networkSecurityGroups",
3324
"name": "[variables('nsgName')]",
3425
"location": "[resourceGroup().location]",
@@ -51,7 +42,7 @@
5142
}
5243
},
5344
{
54-
"apiVersion": "[variables('apiVersion').network.publicIPAddresses]",
45+
"apiVersion": "2015-05-01-preview",
5546
"type": "Microsoft.Network/publicIPAddresses",
5647
"name": "[variables('publicIPAddressName')]",
5748
"location": "[resourceGroup().location]",
@@ -60,7 +51,7 @@
6051
}
6152
},
6253
{
63-
"apiVersion": "[variables('apiVersion').network.VirtualNetworks]",
54+
"apiVersion": "2015-05-01-preview",
6455
"type": "Microsoft.Network/virtualNetworks",
6556
"name": "[variables('vnetName')]",
6657
"location": "[resourceGroup().location]",
@@ -90,7 +81,7 @@
9081
}
9182
},
9283
{
93-
"apiVersion": "[variables('apiVersion').network.networkInterfaces]",
84+
"apiVersion": "2015-05-01-preview",
9485
"type": "Microsoft.Network/networkInterfaces",
9586
"name": "[concat(variables('nicName'), copyindex())]",
9687
"location": "[resourceGroup().location]",

‎101-create-vnet-nsg-only/azuredeploy.json‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": { },
55
"variables": {
6-
"apiVersion": {
7-
"network": {
8-
"virtualNetworks": "2015-05-01-preview",
9-
"networkSecurityGroups": "2015-05-01-preview"
10-
}
11-
},
126
"vnetName": "myVNet",
137
"nsgName": "myNsg",
148
"nsgID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('nsgName'))]",
@@ -18,7 +12,7 @@
1812
},
1913
"resources": [
2014
{
21-
"apiVersion": "[variables('apiVersion').network.networkSecurityGroups]",
15+
"apiVersion": "2015-05-01-preview",
2216
"type": "Microsoft.Network/networkSecurityGroups",
2317
"name": "[variables('nsgName')]",
2418
"location": "[resourceGroup().location]",
@@ -41,7 +35,7 @@
4135
}
4236
},
4337
{
44-
"apiVersion": "[variables('apiVersion').network.virtualNetworks]",
38+
"apiVersion": "2015-05-01-preview",
4539
"type": "Microsoft.Network/virtualNetworks",
4640
"name": "[variables('vnetName')]",
4741
"location": "[resourceGroup().location]",

‎101-create-vnet-only/azuredeploy.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": { },
55
"variables": {
6-
"apiVersion": {
7-
"network": { "virtualNetworks": "2015-05-01-preview" }
8-
},
96
"vnetName": "myVNet",
107
"addressPrefix": "10.0.0.0/24",
118
"subnetName": "Subnet-1",
@@ -14,7 +11,7 @@
1411
},
1512
"resources": [
1613
{
17-
"apiVersion": "[variables('apiVersion').network.virtualNetworks]",
14+
"apiVersion": "2015-05-01-preview",
1815
"type": "Microsoft.Network/virtualNetworks",
1916
"name": "[variables('vnetName')]",
2017
"location": "[resourceGroup().location]",

‎101-linux-customscript-ext/azuredeploy.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,12 @@
1111
}
1212
},
1313
"variables": {
14-
"apiVersion": {
15-
"compute": {
16-
"virtualMachines": { "extensions": "2015-06-15" }
17-
}
18-
}
1914
},
2015
"resources": [
2116
{
2217
"type": "Microsoft.Compute/virtualMachines/extensions",
2318
"name": "[concat(parameters('vmName'),'/LinuxCustomScriptExtension')]",
24-
"apiVersion": "[variables('apiVersion').compute.virtualMachines.extensions]",
19+
"apiVersion": "2015-06-15",
2520
"location": "[resourceGroup().location]",
2621
"properties": {
2722
"publisher": "Microsoft.OSTCExtensions",

‎101-linux-vmaccess-ext/azuredeploy.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,12 @@
2323
}
2424
},
2525
"variables": {
26-
"apiVersion": {
27-
"compute": {
28-
"virtualMachines": { "extensions": "2015-06-15" }
29-
}
30-
}
3126
},
3227
"resources": [
3328
{
3429
"type": "Microsoft.Compute/virtualMachines/extensions",
3530
"name": "[concat(parameters('vmName'),'/LinuxVMAccessExtension')]",
36-
"apiVersion": "[variables('apiVersion').compute.virtualMachines.extensions]",
31+
"apiVersion": "2015-06-15",
3732
"location": "[resourceGroup().location]",
3833
"properties": {
3934
"publisher": "Microsoft.OSTCExtensions",

‎101-simple-linux-vm/azuredeploy.json‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,20 @@
5656
"virtualNetworkName": "[tolower(concat('vnet',uniquestring(resourceGroup().id)))]",
5757
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
5858
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
59-
"networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]",
60-
"apiVersion": {
61-
"resources": { "deployments": "2015-01-01" },
62-
"network": "2015-05-01-preview",
63-
"storage": "2015-05-01-preview",
64-
"compute": "2015-06-15"
65-
}
59+
"networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]"
6660
},
6761
"resources": [
6862
{
6963
"type": "Microsoft.Storage/storageAccounts",
7064
"name": "[toLower(variables('storageAccountName'))]",
71-
"apiVersion": "[variables('apiVersion').storage]",
65+
"apiVersion": "2015-05-01-preview",
7266
"location": "[variables('location')]",
7367
"properties": {
7468
"accountType": "[variables('storageAccountType')]"
7569
}
7670
},
7771
{
78-
"apiVersion": "[variables('apiVersion').network]",
72+
"apiVersion": "2015-05-01-preview",
7973
"type": "Microsoft.Network/networkSecurityGroups",
8074
"name": "[variables('networkSecurityGroupName')]",
8175
"location": "[resourceGroup().location]",
@@ -99,7 +93,7 @@
9993
}
10094
},
10195
{
102-
"apiVersion": "[variables('apiVersion').network]",
96+
"apiVersion": "2015-05-01-preview",
10397
"type": "Microsoft.Network/publicIPAddresses",
10498
"name": "[variables('publicIPAddressName')]",
10599
"location": "[variables('location')]",
@@ -111,7 +105,7 @@
111105
}
112106
},
113107
{
114-
"apiVersion": "[variables('apiVersion').network]",
108+
"apiVersion": "2015-05-01-preview",
115109
"type": "Microsoft.Network/virtualNetworks",
116110
"name": "[variables('virtualNetworkName')]",
117111
"location": "[variables('location')]",
@@ -132,7 +126,7 @@
132126
}
133127
},
134128
{
135-
"apiVersion": "[variables('apiVersion').network]",
129+
"apiVersion": "2015-05-01-preview",
136130
"type": "Microsoft.Network/networkInterfaces",
137131
"name": "[variables('nicName')]",
138132
"location": "[variables('location')]",
@@ -162,7 +156,7 @@
162156
}
163157
},
164158
{
165-
"apiVersion": "[variables('apiVersion').compute]",
159+
"apiVersion": "2015-06-15",
166160
"type": "Microsoft.Compute/virtualMachines",
167161
"name": "[variables('vmName')]",
168162
"location": "[variables('location')]",

‎101-simple-windows-vm-diag/azuredeploy.json‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,8 @@
4545
}
4646
},
4747
"variables": {
48-
"apiVersion": {
49-
"storage": { "storageAccounts": "2015-06-15" },
50-
"compute": { "virtualMachines": "2015-06-15" },
51-
"network": {
52-
"virtualNetworks": "2015-05-01-preview",
53-
"networkInterfaces": "2015-05-01-preview",
54-
"publicIPAddresses": "2015-05-01-preview",
55-
"networkSecurityGroups": "2015-05-01-preview"
56-
},
57-
"insights": { "vmDiagnosticsSettings": "2015-06-15" }
58-
},
59-
"storage": {
60-
"storageAccounts": {
48+
"storage": {
49+
"storageAccounts": {
6150
"name": "[replace(replace(tolower(parameters('storageAccountNamePrefix')), '-',''),'.','')]",
6251
"type": "Standard_LRS"
6352
}
@@ -90,7 +79,7 @@
9079
},
9180
"resources": [
9281
{
93-
"apiVersion": "[variables('apiVersion').network.networkSecurityGroups]",
82+
"apiVersion":"2015-05-01-preview",
9483
"type": "Microsoft.Network/networkSecurityGroups",
9584
"name": "[variables('networkSecurityGroupName')]",
9685
"location": "[resourceGroup().location]",
@@ -118,14 +107,14 @@
118107
{
119108
"type": "Microsoft.Storage/storageAccounts",
120109
"name": "[variables('storage').storageAccounts.name]",
121-
"apiVersion": "[variables('apiVersion').storage.storageAccounts]",
110+
"apiVersion": "2015-06-15",
122111
"location": "[resourceGroup().location]",
123112
"properties": {
124113
"accountType": "[variables('storage').storageAccounts.type]"
125114
}
126115
},
127116
{
128-
"apiVersion": "[variables('apiVersion').network.publicIPAddresses]",
117+
"apiVersion": "2015-05-01-preview",
129118
"type": "Microsoft.Network/publicIPAddresses",
130119
"name": "[variables('publicIPAddressName')]",
131120
"location": "[resourceGroup().location]",
@@ -137,7 +126,7 @@
137126
}
138127
},
139128
{
140-
"apiVersion": "[variables('apiVersion').network.virtualNetworks]",
129+
"apiVersion": "2015-05-01-preview",
141130
"type": "Microsoft.Network/virtualNetworks",
142131
"name": "[variables('virtualNetworkName')]",
143132
"location": "[resourceGroup().location]",
@@ -167,7 +156,7 @@
167156
}
168157
},
169158
{
170-
"apiVersion": "[variables('apiVersion').network.networkInterfaces]",
159+
"apiVersion": "2015-05-01-preview",
171160
"type": "Microsoft.Network/networkInterfaces",
172161
"name": "[variables('nicName')]",
173162
"location": "[resourceGroup().location]",
@@ -193,7 +182,7 @@
193182
}
194183
},
195184
{
196-
"apiVersion": "[variables('apiVersion').compute.virtualMachines]",
185+
"apiVersion": "2015-06-15",
197186
"type": "Microsoft.Compute/virtualMachines",
198187
"name": "[variables('vmName')]",
199188
"location": "[resourceGroup().location]",
@@ -220,7 +209,7 @@
220209
"osDisk": {
221210
"name": "osdisk",
222211
"vhd": {
223-
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storage').storageAccounts.name), variables('apiVersion').storage.storageAccounts).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
212+
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storage').storageAccounts.name), '2015-06-15').primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
224213
},
225214
"caching": "ReadWrite",
226215
"createOption": "FromImage"
@@ -236,7 +225,7 @@
236225
"diagnosticsProfile": {
237226
"bootDiagnostics": {
238227
"enabled": "true",
239-
"storageUri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storage').storageAccounts.name), variables('apiVersion').storage.storageAccounts).primaryEndpoints.blob)]"
228+
"storageUri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storage').storageAccounts.name), '2015-06-15').primaryEndpoints.blob)]"
240229
}
241230
}
242231
},
@@ -245,7 +234,7 @@
245234
"name": "Microsoft.Insights.VMDiagnosticsSettings",
246235
"type": "extensions",
247236
"location": "[resourceGroup().location]",
248-
"apiVersion": "[variables('apiVersion').insights.vmDiagnosticsSettings]",
237+
"apiVersion": "2015-06-15",
249238
"dependsOn": [
250239
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
251240
],

‎101-two-vm-extensions/azuredeploy.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,12 @@
1010
}
1111
},
1212
"variables": {
13-
"apiVersion": {
14-
"compute": {
15-
"virtualMachines": { "extensions": "2015-06-15" }
16-
}
17-
}
1813
},
1914
"resources": [
2015
{
2116
"type": "Microsoft.Compute/virtualMachines/extensions",
2217
"name": "[concat(parameters('vmName'),'/CustomScriptExtension')]",
23-
"apiVersion": "[variables('apiVersion').compute.virtualMachines.extensions]",
18+
"apiVersion": "2015-06-15",
2419
"location": "[resourceGroup().location]",
2520
"properties": {
2621
"publisher": "Microsoft.Compute",
@@ -35,7 +30,7 @@
3530
{
3631
"type": "Microsoft.Compute/virtualMachines/extensions",
3732
"name": "[concat(parameters('vmName'),'/BGInfo')]",
38-
"apiVersion": "[variables('apiVersion').compute.virtualMachines.extensions]",
33+
"apiVersion": "2015-06-15",
3934
"location": "[resourceGroup().location]",
4035
"properties": {
4136
"publisher": "Microsoft.Compute",

0 commit comments

Comments
 (0)