1
0
mirror of synced 2024-11-22 21:16:02 +03:00

Merge pull request #66 from derdanu/master

new Api Version, dynamic Storage Uri to support multi cloud environments
This commit is contained in:
Lin Song 2016-09-28 13:35:49 -05:00 committed by GitHub
commit 37b5726ffd

View File

@ -120,14 +120,16 @@
{ {
"type": "Microsoft.Storage/storageAccounts", "type": "Microsoft.Storage/storageAccounts",
"name": "[variables('storageName')]", "name": "[variables('storageName')]",
"apiVersion": "[variables('apiVersion')]", "apiVersion": "2016-01-01",
"location": "[variables('location')]", "location": "[variables('location')]",
"tags": { "tags": {
"displayName": "StorageAccount" "displayName": "StorageAccount"
}, },
"properties": { "properties": {},
"accountType": "[variables('vhdStorageType')]" "sku": {
} "name": "[variables('vhdStorageType')]"
},
"kind": "Storage"
}, },
{ {
"apiVersion": "[variables('apiVersion')]", "apiVersion": "[variables('apiVersion')]",
@ -187,9 +189,9 @@
} }
}, },
{ {
"apiVersion": "[variables('apiVersion')]",
"type": "Microsoft.Compute/virtualMachines", "type": "Microsoft.Compute/virtualMachines",
"name": "[variables('vmName')]", "name": "[variables('vmName')]",
"apiVersion": "2016-03-30",
"location": "[resourceGroup().location]", "location": "[resourceGroup().location]",
"tags": { "tags": {
"displayName": "VirtualMachine" "displayName": "VirtualMachine"
@ -211,7 +213,7 @@
"osDisk": { "osDisk": {
"name": "osdisk", "name": "osdisk",
"vhd": { "vhd": {
"uri": "[concat('http://', variables('storageName'), '.blob.core.windows.net/vmachines/', variables('vmName'), '.vhd')]" "uri": "[concat(reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageName'))).primaryEndpoints.blob, 'vmachines/', variables('vmName'), '.vhd')]"
}, },
"caching": "ReadWrite", "caching": "ReadWrite",
"createOption": "FromImage" "createOption": "FromImage"