Skip to content

Commit 50bb588

Browse files
vikasnavvikasnav
committed
Merge remote-tracking branch 'origin/develop'
2 parents 7e190c3 + 7cccd21 commit 50bb588

File tree

167 files changed

+4156
-6619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+4156
-6619
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: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,23 @@
66
"type": "string",
77
"metadata": {
88
"description": "Name of the existing VM to apply Linux custom script to"
9-
}
10-
}
11-
9+
},
10+
"defaultValue": "[concat('vm', resourceGroup().name)]"
11+
}
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",
2823
"type": "CustomScriptForLinux",
2924
"typeHandlerVersion": "1.3",
25+
"autoUpgradeMinorVersion": "true",
3026
"settings": {
3127
"commandToExecute": "ifconfig"
3228
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
4-
"parameters": {
5-
"vmName": {
6-
"value": "myVM001"
7-
}
8-
}
9-
}
4+
"parameters": { }
5+
}

‎101-linux-docker-extension/azuredeploy.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"type": "string",
77
"metadata": {
88
"description": "Name of the existing VM to apply Docker extension to"
9-
}
9+
},
10+
"defaultValue": "[concat('vm', resourceGroup().name)]"
1011
}
1112

1213
},

‎101-linux-docker-extension/azuredeploy.parameters.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
4-
"parameters": {
5-
"vmName": {
6-
"value": "myVM001"
7-
}
8-
}
9-
}
4+
"parameters": { }
5+
}

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"type": "string",
77
"metadata": {
88
"description": "Name of the existing Linux VM to modify"
9-
}
9+
},
10+
"defaultValue": "[concat('vm', resourceGroup().name)]"
1011
},
1112
"username": {
1213
"type": "string",
@@ -22,22 +23,18 @@
2223
}
2324
},
2425
"variables": {
25-
"apiVersion": {
26-
"compute": {
27-
"virtualMachines": { "extensions": "2015-06-15" }
28-
}
29-
}
3026
},
3127
"resources": [
3228
{
3329
"type": "Microsoft.Compute/virtualMachines/extensions",
3430
"name": "[concat(parameters('vmName'),'/LinuxVMAccessExtension')]",
35-
"apiVersion": "[variables('apiVersion').compute.virtualMachines.extensions]",
31+
"apiVersion": "2015-06-15",
3632
"location": "[resourceGroup().location]",
3733
"properties": {
3834
"publisher": "Microsoft.OSTCExtensions",
3935
"type": "VMAccessForLinux",
40-
"typeHandlerVersion": "1.3",
36+
"typeHandlerVersion": "1.4",
37+
"autoUpgradeMinorVersion": "true",
4138
"settings": { },
4239
"protectedSettings": {
4340
"username": "[parameters('username')]",

0 commit comments

Comments
 (0)