Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/azure-quickstart-te…
Browse files Browse the repository at this point in the history 
…mplates
  • Loading branch information
@bmoore-msft
bmoore-msft committed May 25, 2018
2 parents 5533cce + 0b4f220 commit 8a9eb2e
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 131 deletions.
12 changes: 3 additions & 9 deletions 201-vm-domain-join/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
}
},
{
"apiVersion": "2015-06-15",
"apiVersion": "2017-03-30",
"type": "Microsoft.Compute/virtualMachines",
"name": "[parameters('dnsLabelPrefix')]",
"location": "[parameters('location')]",
Expand All @@ -161,19 +161,13 @@
"version": "latest"
},
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), '2015-06-15').primaryEndpoints.blob,'vhds/',parameters('dnsLabelPrefix'), 'disk0.vhd')]"
},
"name": "[concat(parameters('dnsLabelPrefix'),'_OsDisk')]",
"caching": "ReadWrite",
"createOption": "FromImage"
},
"dataDisks": [
{
"name": "myvm-data-disk1",
"vhd": {
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), '2015-06-15').primaryEndpoints.blob,'vhds/',parameters('dnsLabelPrefix'), 'disk1.vhd')]"
},
"name": "[concat(parameters('dnsLabelPrefix'),'_dataDisk1')]",
"caching": "None",
"createOption": "Empty",
"diskSizeGB": "1000",
Expand Down
3 changes: 2 additions & 1 deletion 201-vm-domain-join/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
"itemDisplayName": "Join a VM to an existing domain",
"description": "This template demonstrates domain join to a private AD domain up in cloud.",
"summary": "This template joins a VM to an existing domain",
"githubUsername": "singhkays",
"dateUpdated": "2017-05-12"
"dateUpdated": "2018-05-25"
}
3 changes: 2 additions & 1 deletion 301-storage-spaces-direct/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
"itemDisplayName": "Windows Server 2016 Storage Spaces Direct (S2D) SOFS cluster",
"description": "This template creates Azure VMs on an existing VNET, and it provisions them as a Windows Server 2016 Storage Spaces Direct (S2D) Scale-Out File Server (SOFS) cluster.",
"summary": "This template creates Azure VMs for a Windows Server 2016 Storage Spaces Direct (S2D) cluster on an existing Azure VNET and Active Directory domain.",
"githubUsername": "robotechredmond",
"dateUpdated": "2017-03-08"
"dateUpdated": "2018-05-23"
}
96 changes: 0 additions & 96 deletions 301-storage-spaces-direct/nestedtemplates/diskSelection.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,319 +34,223 @@
"name": "[concat(parameters('diskNamingPrefix'), 'disk0')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 0,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk0.vhd')]"
},
"caching": "[parameters('diskCaching')]",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk1')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 1,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk1.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk2')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 2,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk2.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk3')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 3,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk3.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk4')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 4,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk4.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk5')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 5,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk5.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk6')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 6,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk6.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk7')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 7,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk7.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk8')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 8,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk8.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk9')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 9,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk9.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk10')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 10,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk10.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk11')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 11,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk11.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk12')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 12,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk12.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk13')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 13,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk13.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk14')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 14,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk14.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk15')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 15,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk15.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk16')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 16,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk16.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk17')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 17,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk17.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk18')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 18,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk18.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk19')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 19,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk19.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk20')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 20,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk20.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk21')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 21,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk21.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk22')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 22,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk22.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk23')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 23,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk23.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk24')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 24,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk24.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk25')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 25,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk25.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk26')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 26,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk26.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk27')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 27,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk27.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk28')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 28,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk28.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk29')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 29,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk29.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk30')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 30,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk30.vhd')]"
},
"caching": "None",
"createOption": "Empty"
},
{
"name": "[concat(parameters('diskNamingPrefix'), 'disk31')]",
"diskSizeGB": "[parameters('vmDiskSize')]",
"lun": 31,
"vhd": {
"uri": "[concat(parameters('storageAccountUri'),'vhds/',parameters('diskNamingPrefix'),'disk31.vhd')]"
},
"caching": "None",
"createOption": "Empty"
}
Expand Down
7 changes: 2 additions & 5 deletions 301-storage-spaces-direct/nestedtemplates/newVM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
},
{
"type": "Microsoft.Compute/virtualMachines",
"apiVersion": "2015-06-15",
"apiVersion": "2017-03-30",
"location": "[parameters('location')]",
"name": "[parameters('vmName')]",
"dependsOn": [
Expand All @@ -112,10 +112,7 @@
"version": "[parameters('imageVersion')]"
},
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat(parameters('storageAccountUri'), 'vhds/',parameters('vmName'),'-osdisk.vhd')]"
},
"name": "[concat(parameters('vmName'),'_OsDisk')]",
"caching": "ReadWrite",
"createOption": "FromImage"
},
Expand Down
Loading

0 comments on commit 8a9eb2e

Please sign in to comment.