diff --git a/201-2-vms-loadbalancer-lbrules/azuredeploy-parameters.json b/201-2-vms-loadbalancer-lbrules/azuredeploy-parameters.json index 825fde0..f6e695e 100644 --- a/201-2-vms-loadbalancer-lbrules/azuredeploy-parameters.json +++ b/201-2-vms-loadbalancer-lbrules/azuredeploy-parameters.json @@ -1,17 +1,17 @@ { - "region": { + "location": { "value": "West US" }, - "storageAccountName": { - "value" : "coudf87" + "newStorageAccountName": { + "value" : "kaystore2d" }, "adminUsername": { - "value" : "cloudguy" + "value" : "kay" }, "adminPassword": { "value": "abc_123!" }, "dnsNameforLBIP": { - "value": "coudf87" + "value": "kaydns2" } } diff --git a/201-2-vms-loadbalancer-lbrules/azuredeploy.json b/201-2-vms-loadbalancer-lbrules/azuredeploy.json index 9ba8cbb..eec2d77 100644 --- a/201-2-vms-loadbalancer-lbrules/azuredeploy.json +++ b/201-2-vms-loadbalancer-lbrules/azuredeploy.json @@ -8,7 +8,7 @@ "description": "Location of resources" } }, - "storageAccountName": { + "newStorageAccountName": { "type": "string", "metadata": { "description": "Name of storage account" @@ -46,9 +46,26 @@ "description": "Prefix to use for VM names" } }, - "vmSourceImageName": { + "imagePublisher": { "type": "string", - "defaultValue": "a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-R2-201412.01-en.us-127GB.vhd" + "defaultValue": "MicrosoftWindowsServer", + "metadata": { + "description": "Image Publisher" + } + }, + "imageOffer": { + "type": "string", + "defaultValue": "WindowsServer", + "metadata": { + "description": "Image Offer" + } + }, + "imageSKU": { + "type": "string", + "defaultValue": "2012-R2-Datacenter", + "metadata": { + "description": "Image SKU" + } }, "lbName": { "type": "string", @@ -88,7 +105,6 @@ }, "variables": { "storageAccountType": "Standard_LRS", - "vmStorageAccountContainerName": "vhds", "availabilitySetName": "myAvSet", "addressPrefix": "10.0.0.0/16", "subnetName": "Subnet-1", @@ -104,14 +120,13 @@ "frontEndIPConfigID": "[concat(variables('lbID'),'/frontendIPConfigurations/LBFE')]", "backEndIPConfigID1": "[concat(variables('nicId1'),'/ipConfigurations/ipconfig1')]", "backEndIPConfigID2": "[concat(variables('nicId2'),'/ipConfigurations/ipconfig1')]", - "sourceImageName": "[concat('/', subscription().subscriptionId,'/services/images/',parameters('vmSourceImageName'))]", "lbPoolID": "[concat(variables('lbID'),'/backendAddressPools/LBBE')]", "lbProbeID": "[concat(variables('lbID'),'/probes/tcpProbe')]" }, "resources": [ { "type": "Microsoft.Storage/storageAccounts", - "name": "[parameters('storageAccountName')]", + "name": "[parameters('newStorageAccountName')]", "apiVersion": "2015-05-01-preview", "location": "[parameters('location')]", "properties": { @@ -296,7 +311,7 @@ }, "location": "[parameters('location')]", "dependsOn": [ - "[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccountName'))]", + "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]", "[concat('Microsoft.Network/networkInterfaces/', parameters('nicNamePrefix'), copyindex())]", "[concat('Microsoft.Compute/availabilitySets/', variables('availabilitySetName'))]" ], @@ -313,10 +328,20 @@ "adminPassword": "[parameters('adminPassword')]" }, "storageProfile": { - "sourceImage": { - "id": "[variables('sourceImageName')]" - }, - "destinationVhdsContainer": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/')]" + "imageReference": { + "publisher": "[parameters('imagePublisher')]", + "offer": "[parameters('imageOffer')]", + "sku" : "[parameters('imageSKU')]", + "version":"latest" + }, + "osDisk" : { + "name": "osdisk", + "vhd": { + "uri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net/vhds/','osdisk.vhd')]" + }, + "caching": "ReadWrite", + "createOption": "FromImage" + } }, "networkProfile": { "networkInterfaces": [