diff --git a/101-vm-linux-create/azuredeploy.json b/101-vm-linux-create/azuredeploy.json index d0556a0..1ad1cce 100644 --- a/101-vm-linux-create/azuredeploy.json +++ b/101-vm-linux-create/azuredeploy.json @@ -1,190 +1,194 @@ { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "adminUsername": { - "type": "string", - "metadata": { - "description": "Username for the Virtual Machine. Default value is localadmin" + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "adminUsername": { + "type": "string", + "metadata": { + "description": "Username for the Virtual Machine. Default value is localadmin" + }, + "defaultValue": "localadmin" + }, + "adminPassword": { + "type": "securestring", + "defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]", + "metadata": { + "description": "Password for the Virtual Machine. Default value is 'Subscription#'" + } + }, + "imagePublisher": { + "type": "string", + "defaultValue": "Canonical", + "metadata": { + "description": "Maps to the publisher in the Azure Stack Platform Image Repository manifest file Eg: Canonical, Suse, OpenLogic " + } + }, + "imageOffer": { + "type": "string", + "defaultValue": "UbuntuServer", + "metadata": { + "description": "Maps to the Offer in the Azure Stack Platform Image Repository manifest file Eg: UbuntuServer, SlesServer, CentOS " + } + }, + "imageSku": { + "type": "string", + "defaultValue": "16.04-LTS", + "allowedValues": [ + "14.04-LTS", + "16.04-LTS" + ], + "metadata": { + "description": "Maps to the sku in the Azure Stack Platform Image Repository manifest file Eg: 12.SP1, 6.7 , 7.2" + } + } + }, + "variables": { + "dnsNameForPublicIP": "[tolower(concat('dns', uniquestring(resourceGroup().id)))]", + "location": "[resourceGroup().location]", + "OSDiskName": "osdisk", + "nicName": "[tolower(concat('nic',uniquestring(resourceGroup().id)))]", + "addressPrefix": "10.0.0.0/24", + "subnetName": "[tolower(concat('subnet',uniquestring(resourceGroup().id)))]", + "subnetPrefix": "10.0.0.0/24", + "storageAccountName": "[concat('sa', uniquestring(resourceGroup().id))]", + "storageAccountType": "Standard_LRS", + "vmStorageAccountContainerName": "vhds", + "vmName": "[substring(concat('simplelinuxvm',resourceGroup().Name),0,14)]", + "vmSize": "Standard_A1", + "virtualNetworkName": "[tolower(concat('vnet',uniquestring(resourceGroup().id)))]", + "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", + "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", + "networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]" + }, + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "name": "[toLower(variables('storageAccountName'))]", + "apiVersion": "2015-05-01-preview", + "location": "[variables('location')]", + "properties": { + "accountType": "[variables('storageAccountType')]" + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/networkSecurityGroups", + "name": "[variables('networkSecurityGroupName')]", + "location": "[resourceGroup().location]", + "properties": { + "securityRules": [ + { + "name": "ssh", + "properties": { + "description": "Allow RDP", + "protocol": "Tcp", + "sourcePortRange": "*", + "destinationPortRange": "22", + "sourceAddressPrefix": "*", + "destinationAddressPrefix": "*", + "access": "Allow", + "priority": 200, + "direction": "Inbound" + } + } + ] + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/virtualNetworks", + "name": "[variables('virtualNetworkName')]", + "location": "[variables('location')]", + "properties": { + "addressSpace": { + "addressPrefixes": [ + "[variables('addressPrefix')]" + ] + }, + "subnets": [ + { + "name": "[variables('subnetName')]", + "properties": { + "addressPrefix": "[variables('subnetPrefix')]" + } + } + ] + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/networkInterfaces", + "name": "[variables('nicName')]", + "location": "[variables('location')]", + "dependsOn": [ + "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", + "[variables('networkSecurityGroupName')]" + ], + "properties": { + "networkSecurityGroup": { + "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]" + }, + "ipConfigurations": [ + { + "name": "ipconfig1", + "properties": { + "privateIPAllocationMethod": "Dynamic", + "subnet": { + "id": "[variables('subnetRef')]" + } + } + } + ] + } + }, + { + "apiVersion": "2015-06-15", + "type": "Microsoft.Compute/virtualMachines", + "name": "[variables('vmName')]", + "location": "[variables('location')]", + "dependsOn": [ + "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", + "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]" + ], + "properties": { + "hardwareProfile": { + "vmSize": "[variables('vmSize')]" + }, + "osProfile": { + "computerName": "[variables('vmName')]", + "adminUsername": "[parameters('adminUsername')]", + "adminPassword": "[parameters('adminPassword')]" + }, + "storageProfile": { + "imageReference": { + "publisher": "[parameters('imagePublisher')]", + "offer": "[parameters('imageOffer')]", + "sku": "[parameters('imageSku')]", + "version": "latest" + }, + "osDisk": { + "name": "osdisk", + "vhd": { + "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/', variables('OSDiskName'), '.vhd')]" }, - "defaultValue": "localadmin" + "caching": "ReadWrite", + "createOption": "FromImage" + } }, - "adminPassword": { - "type": "securestring", - "defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]", - "metadata": { - "description": "Password for the Virtual Machine. Default value is 'Subscription#'" + "networkProfile": { + "networkInterfaces": [ + { + "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]" } + ] }, - "imagePublisher": { - "type": "string", - "defaultValue": "Canonical", - "metadata": { - "description": "Maps to the publisher in the Azure Stack Platform Image Repository manifest file Eg: Canonical, Suse, OpenLogic " - } - }, - "imageOffer": { - "type": "string", - "defaultValue": "UbuntuServer", - "metadata": { - "description": "Maps to the Offer in the Azure Stack Platform Image Repository manifest file Eg: UbuntuServer, SlesServer, CentOS " - } - }, - "imageSku": { - "type": "string", - "defaultValue": "14.04.3-LTS", - "metadata": { - "description": "Maps to the sku in the Azure Stack Platform Image Repository manifest file Eg: 12.SP1, 6.7 , 7.2" - } + "diagnosticsProfile": { + "bootDiagnostics": { + "enabled": "true", + "storageUri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob)]" + } } - }, - "variables": { - "dnsNameForPublicIP": "[tolower(concat('dns', uniquestring(resourceGroup().id)))]", - "location": "[resourceGroup().location]", - "OSDiskName": "osdisk", - "nicName": "[tolower(concat('nic',uniquestring(resourceGroup().id)))]", - "addressPrefix": "10.0.0.0/24", - "subnetName": "[tolower(concat('subnet',uniquestring(resourceGroup().id)))]", - "subnetPrefix": "10.0.0.0/24", - "storageAccountName": "[concat('sa', uniquestring(resourceGroup().id))]", - "storageAccountType": "Standard_LRS", - "vmStorageAccountContainerName": "vhds", - "vmName": "[substring(concat('simplelinuxvm',resourceGroup().Name),0,14)]", - "vmSize": "Standard_A1", - "virtualNetworkName": "[tolower(concat('vnet',uniquestring(resourceGroup().id)))]", - "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", - "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", - "networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]" - }, - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "name": "[toLower(variables('storageAccountName'))]", - "apiVersion": "2015-05-01-preview", - "location": "[variables('location')]", - "properties": { - "accountType": "[variables('storageAccountType')]" - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/networkSecurityGroups", - "name": "[variables('networkSecurityGroupName')]", - "location": "[resourceGroup().location]", - "properties": { - "securityRules": [ - { - "name": "ssh", - "properties": { - "description": "Allow RDP", - "protocol": "Tcp", - "sourcePortRange": "*", - "destinationPortRange": "22", - "sourceAddressPrefix": "*", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 200, - "direction": "Inbound" - } - } - ] - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/virtualNetworks", - "name": "[variables('virtualNetworkName')]", - "location": "[variables('location')]", - "properties": { - "addressSpace": { - "addressPrefixes": [ - "[variables('addressPrefix')]" - ] - }, - "subnets": [ - { - "name": "[variables('subnetName')]", - "properties": { - "addressPrefix": "[variables('subnetPrefix')]" - } - } - ] - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/networkInterfaces", - "name": "[variables('nicName')]", - "location": "[variables('location')]", - "dependsOn": [ - "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", - "[variables('networkSecurityGroupName')]" - ], - "properties": { - "networkSecurityGroup": { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]" - }, - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "privateIPAllocationMethod": "Dynamic", - "subnet": { - "id": "[variables('subnetRef')]" - } - } - } - ] - } - }, - { - "apiVersion": "2015-06-15", - "type": "Microsoft.Compute/virtualMachines", - "name": "[variables('vmName')]", - "location": "[variables('location')]", - "dependsOn": [ - "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", - "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[variables('vmSize')]" - }, - "osProfile": { - "computerName": "[variables('vmName')]", - "adminUsername": "[parameters('adminUsername')]", - "adminPassword": "[parameters('adminPassword')]" - }, - "storageProfile": { - "imageReference": { - "publisher": "[parameters('imagePublisher')]", - "offer": "[parameters('imageOffer')]", - "sku": "[parameters('imageSku')]", - "version": "latest" - }, - "osDisk": { - "name": "osdisk", - "vhd": { - "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/', variables('OSDiskName'), '.vhd')]" - }, - "caching": "ReadWrite", - "createOption": "FromImage" - } - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]" - } - ] - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": "true", - "storageUri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob)]" - } - } - } - } - ] + } + } + ] } diff --git a/101-vmss-linux-vm/azuredeploy.json b/101-vmss-linux-vm/azuredeploy.json index 570aaf5..17313be 100644 --- a/101-vmss-linux-vm/azuredeploy.json +++ b/101-vmss-linux-vm/azuredeploy.json @@ -1,271 +1,275 @@ { - "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json", - "contentVersion": "1.0.0.0", - "parameters": { - "vmSku": { - "defaultValue": "Standard_A1", - "type": "String", - "metadata": { - "description": "Size of VMs in the VM Scale Set." - } + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json", + "contentVersion": "1.0.0.0", + "parameters": { + "vmSku": { + "defaultValue": "Standard_A1", + "type": "String", + "metadata": { + "description": "Size of VMs in the VM Scale Set." + } + }, + "vmssName": { + "type": "String", + "defaultValue": "[substring(concat('vmss', uniquestring(replace(resourceGroup().Id,'-',''))), 0, 8)]", + "metadata": { + "description": "String used as a base for naming resources. Must be 3-10 characters in length and globally unique across Azure Stack. A hash is prepended to this string for some resources, and resource-specific information is appended." + } + }, + "instanceCount": { + "defaultValue": 2, + "maxValue": 20, + "type": "Int", + "metadata": { + "description": "Number of VM instances (20 or less)." + } + }, + "adminUsername": { + "type": "String", + "defaultValue": "azureuser", + "metadata": { + "description": "Admin username on all VMs." + } + }, + "adminPassword": { + "type": "SecureString", + "defaultValue": "[concat('Subscription#', subscription().subscriptionId)]", + "metadata": { + "description": "Admin password on all VMs." + } + }, + "osImagePublisher": { + "type": "string", + "defaultValue": "Canonical", + "metadata": { + "description": "Maps to the publisher in the Azure Stack Platform Image Repository manifest file." + } + }, + "osImageOffer": { + "type": "string", + "defaultValue": "UbuntuServer", + "metadata": { + "description": "Maps to the Offer in the Azure Stack Platform Image Repository manifest file." + } + }, + "osImageSku": { + "type": "string", + "defaultValue": "16.04-LTS", + "allowedValues": [ + "14.04-LTS", + "16.04-LTS" + ], + "metadata": { + "description": "Maps to the sku in the Azure Stack Platform Image Repository." + } + } + }, + "variables": { + "location": "[resourceGroup().location]", + "vnetName": "[toLower(concat('vnet', uniqueString(resourceGroup().id)))]", + "subnetName": "[toLower(concat('subnet', uniqueString(resourceGroup().id)))]", + "storageAccountName": "[toLower(concat('SA', uniqueString(resourceGroup().id)))]", + "storageAccountContainerName": "[toLower(concat('SC', uniqueString(resourceGroup().id)))]", + "storageAccountType": "Standard_LRS", + "OSDiskName": "osdisk", + "vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('vnetName'))]", + "subnetRef": "[concat(variables('vnetID'),'/subnets/', variables('subnetName'))]", + "publicIPAddressName": "[toLower(concat('pip', uniqueString(resourceGroup().id)))]", + "vmssDomainName": "[toLower(concat('pubdns', uniqueString(resourceGroup().id)))]", + "loadBalancerName": "[concat('LB', uniqueString(resourceGroup().id))]", + "loadBalancerFrontEndName": "[concat('LBFrontEnd', uniqueString(resourceGroup().id))]", + "loadBalancerBackEndName": "[concat('LBBackEnd', uniqueString(resourceGroup().id))]", + "loadBalancerProbeName": "[concat('LBHttpProbe', uniqueString(resourceGroup().id))]", + "loadBalancerNatPoolName": "[concat('LBNatPool', uniqueString(resourceGroup().id))]" + }, + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "name": "[variables('storageAccountName')]", + "apiVersion": "2015-06-15", + "location": "[variables('location')]", + "properties": { + "accountType": "[variables('storageAccountType')]" + } + }, + { + "type": "Microsoft.Network/virtualNetworks", + "name": "[variables('vnetName')]", + "apiVersion": "2015-06-15", + "location": "[variables('location')]", + "properties": { + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] }, - "vmssName": { - "type": "String", - "defaultValue": "[substring(concat('vmss', uniquestring(replace(resourceGroup().Id,'-',''))), 0, 8)]", - "metadata": { - "description": "String used as a base for naming resources. Must be 3-10 characters in length and globally unique across Azure Stack. A hash is prepended to this string for some resources, and resource-specific information is appended." - } - }, - "instanceCount": { - "defaultValue": 2, - "maxValue": 20, - "type": "Int", - "metadata": { - "description": "Number of VM instances (20 or less)." - } - }, - "adminUsername": { - "type": "String", - "defaultValue": "azureuser", - "metadata": { - "description": "Admin username on all VMs." - } - }, - "adminPassword": { - "type": "SecureString", - "defaultValue": "[concat('Subscription#', subscription().subscriptionId)]", - "metadata": { - "description": "Admin password on all VMs." - } - }, - "osImagePublisher": { - "type": "string", - "defaultValue": "Canonical", - "metadata": { - "description": "Maps to the publisher in the Azure Stack Platform Image Repository manifest file." - } - }, - "osImageOffer": { - "type": "string", - "defaultValue": "UbuntuServer", - "metadata": { - "description": "Maps to the Offer in the Azure Stack Platform Image Repository manifest file." - } - }, - "osImageSku": { - "type": "string", - "defaultValue": "14.04.3-LTS", - "metadata": { - "description": "Maps to the sku in the Azure Stack Platform Image Repository." + "subnets": [ + { + "name": "[variables('subnetName')]", + "properties": { + "addressPrefix": "10.0.0.0/24" } + } + ] + } + }, + { + "type": "Microsoft.Network/publicIPAddresses", + "name": "[variables('publicIPAddressName')]", + "apiVersion": "2015-06-15", + "location": "[variables('location')]", + "properties": { + "publicIPAllocationMethod": "Dynamic", + "dnsSettings": { + "domainNameLabel": "[variables('vmssDomainName')]" } + } }, - "variables": { - "location": "[resourceGroup().location]", - "vnetName": "[toLower(concat('vnet', uniqueString(resourceGroup().id)))]", - "subnetName": "[toLower(concat('subnet', uniqueString(resourceGroup().id)))]", - "storageAccountName": "[toLower(concat('SA', uniqueString(resourceGroup().id)))]", - "storageAccountContainerName": "[toLower(concat('SC', uniqueString(resourceGroup().id)))]", - "storageAccountType": "Standard_LRS", - "OSDiskName": "osdisk", - "vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('vnetName'))]", - "subnetRef": "[concat(variables('vnetID'),'/subnets/', variables('subnetName'))]", - "publicIPAddressName": "[toLower(concat('pip', uniqueString(resourceGroup().id)))]", - "vmssDomainName": "[toLower(concat('pubdns', uniqueString(resourceGroup().id)))]", - "loadBalancerName": "[concat('LB', uniqueString(resourceGroup().id))]", - "loadBalancerFrontEndName": "[concat('LBFrontEnd', uniqueString(resourceGroup().id))]", - "loadBalancerBackEndName": "[concat('LBBackEnd', uniqueString(resourceGroup().id))]", - "loadBalancerProbeName": "[concat('LBHttpProbe', uniqueString(resourceGroup().id))]", - "loadBalancerNatPoolName": "[concat('LBNatPool', uniqueString(resourceGroup().id))]" + { + "type": "Microsoft.Network/loadBalancers", + "name": "[variables('loadBalancerName')]", + "apiVersion": "2015-06-15", + "location": "[variables('location')]", + "properties": { + "frontendIPConfigurations": [ + { + "name": "[variables('loadBalancerFrontEndName')]", + "properties": { + "publicIPAddress": { + "id": "[resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName'))]" + } + } + } + ], + "backendAddressPools": [ + { + "name": "[variables('loadBalancerBackendName')]" + } + ], + "loadBalancingRules": [ + { + "name": "roundRobinLBRule", + "properties": { + "frontendIPConfiguration": { + "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/frontendIPConfigurations/', variables('loadBalancerFrontEndName'))]" + }, + "backendAddressPool": { + "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/backendAddressPools/', variables('loadBalancerBackendName'))]" + }, + "protocol": "tcp", + "frontendPort": 80, + "backendPort": 80, + "enableFloatingIP": false, + "idleTimeoutInMinutes": 5, + "probe": { + "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/probes/', variables('loadBalancerProbeName'))]" + } + } + } + ], + "probes": [ + { + "name": "[variables('loadBalancerProbeName')]", + "properties": { + "protocol": "tcp", + "port": 80, + "intervalInSeconds": "5", + "numberOfProbes": "2" + } + } + ], + "inboundNatPools": [ + { + "name": "[variables('loadBalancerNatPoolName')]", + "properties": { + "frontendIPConfiguration": { + "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/frontendIPConfigurations/', variables('loadBalancerFrontEndName'))]" + }, + "protocol": "tcp", + "frontendPortRangeStart": "50000", + "frontendPortRangeEnd": "50019", + "backendPort": "3389" + } + } + ] + }, + "dependsOn": [ + "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]" + ] }, - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "name": "[variables('storageAccountName')]", - "apiVersion": "2015-06-15", - "location": "[variables('location')]", - "properties": { - "accountType": "[variables('storageAccountType')]" - } + { + "type": "Microsoft.Compute/virtualMachineScaleSets", + "sku": { + "name": "[parameters('vmSku')]", + "tier": "Standard", + "capacity": "[parameters('instanceCount')]" + }, + "name": "[parameters('vmssName')]", + "apiVersion": "2016-03-30", + "location": "[variables('location')]", + "properties": { + "upgradePolicy": { + "mode": "Manual" }, - { - "type": "Microsoft.Network/virtualNetworks", - "name": "[variables('vnetName')]", - "apiVersion": "2015-06-15", - "location": "[variables('location')]", - "properties": { - "addressSpace": { - "addressPrefixes": [ - "10.0.0.0/16" - ] - }, - "subnets": [ - { - "name": "[variables('subnetName')]", - "properties": { - "addressPrefix": "10.0.0.0/24" - } - } - ] - } - }, - { - "type": "Microsoft.Network/publicIPAddresses", - "name": "[variables('publicIPAddressName')]", - "apiVersion": "2015-06-15", - "location": "[variables('location')]", - "properties": { - "publicIPAllocationMethod": "Dynamic", - "dnsSettings": { - "domainNameLabel": "[variables('vmssDomainName')]" - } - } - }, - { - "type": "Microsoft.Network/loadBalancers", - "name": "[variables('loadBalancerName')]", - "apiVersion": "2015-06-15", - "location": "[variables('location')]", - "properties": { - "frontendIPConfigurations": [ - { - "name": "[variables('loadBalancerFrontEndName')]", - "properties": { - "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName'))]" - } - } - } - ], - "backendAddressPools": [ - { - "name": "[variables('loadBalancerBackendName')]" - } - ], - "loadBalancingRules": [ - { - "name": "roundRobinLBRule", - "properties": { - "frontendIPConfiguration": { - "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/frontendIPConfigurations/', variables('loadBalancerFrontEndName'))]" - }, - "backendAddressPool": { - "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/backendAddressPools/', variables('loadBalancerBackendName'))]" - }, - "protocol": "tcp", - "frontendPort": 80, - "backendPort": 80, - "enableFloatingIP": false, - "idleTimeoutInMinutes": 5, - "probe": { - "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/probes/', variables('loadBalancerProbeName'))]" - } - } - } - ], - "probes": [ - { - "name": "[variables('loadBalancerProbeName')]", - "properties": { - "protocol": "tcp", - "port": 80, - "intervalInSeconds": "5", - "numberOfProbes": "2" - } - } - ], - "inboundNatPools": [ - { - "name": "[variables('loadBalancerNatPoolName')]", - "properties": { - "frontendIPConfiguration": { - "id": "[concat(resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName')), '/frontendIPConfigurations/', variables('loadBalancerFrontEndName'))]" - }, - "protocol": "tcp", - "frontendPortRangeStart": "50000", - "frontendPortRangeEnd": "50019", - "backendPort": "3389" - } - } - ] + "virtualMachineProfile": { + "storageProfile": { + "osDisk": { + "vhdContainers": [ + "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('storageAccountContainerName'))]" + ], + "name": "[variables('OSDiskName')]", + "caching": "ReadOnly", + "createOption": "FromImage" }, - "dependsOn": [ - "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]" - ] - }, - { - "type": "Microsoft.Compute/virtualMachineScaleSets", - "sku": { - "name": "[parameters('vmSku')]", - "tier": "Standard", - "capacity": "[parameters('instanceCount')]" - }, - "name": "[parameters('vmssName')]", - "apiVersion": "2016-03-30", - "location": "[variables('location')]", - "properties": { - "upgradePolicy": { - "mode": "Manual" - }, - "virtualMachineProfile": { - "storageProfile": { - "osDisk": { - "vhdContainers": [ - "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('storageAccountContainerName'))]" - ], - "name": "[variables('OSDiskName')]", - "caching": "ReadOnly", - "createOption": "FromImage" + "imageReference": { + "publisher": "[parameters('osImagePublisher')]", + "offer": "[parameters('osImageOffer')]", + "sku": "[parameters('osImageSku')]", + "version": "latest" + } + }, + "osProfile": { + "computerNamePrefix": "[parameters('vmssName')]", + "adminUsername": "[parameters('adminUsername')]", + "adminPassword": "[parameters('adminPassword')]" + }, + "networkProfile": { + "networkInterfaceConfigurations": [ + { + "name": "nic", + "properties": { + "primary": "true", + "ipConfigurations": [ + { + "name": "ipconfig", + "properties": { + "subnet": { + "id": "[variables('subnetRef')]" }, - "imageReference": { - "publisher": "[parameters('osImagePublisher')]", - "offer": "[parameters('osImageOffer')]", - "sku": "[parameters('osImageSku')]", - "version": "latest" - } - }, - "osProfile": { - "computerNamePrefix": "[parameters('vmssName')]", - "adminUsername": "[parameters('adminUsername')]", - "adminPassword": "[parameters('adminPassword')]" - }, - "networkProfile": { - "networkInterfaceConfigurations": [ - { - "name": "nic", - "properties": { - "primary": "true", - "ipConfigurations": [ - { - "name": "ipconfig", - "properties": { - "subnet": { - "id": "[variables('subnetRef')]" - }, - "loadBalancerBackendAddressPools": [ - { - "id": "[concat('/subscriptions/', subscription().subscriptionId,'/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('loadBalancerName'), '/backendAddressPools/', variables('loadBalancerBackEndName'))]" - } - ], - "loadBalancerInboundNatPools": [ - { - "id": "[concat('/subscriptions/', subscription().subscriptionId,'/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('loadBalancerName'), '/inboundNatPools/', variables('loadBalancerNatPoolName'))]" - } - ] - } - } - ] - } - } + "loadBalancerBackendAddressPools": [ + { + "id": "[concat('/subscriptions/', subscription().subscriptionId,'/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('loadBalancerName'), '/backendAddressPools/', variables('loadBalancerBackEndName'))]" + } + ], + "loadBalancerInboundNatPools": [ + { + "id": "[concat('/subscriptions/', subscription().subscriptionId,'/resourceGroups/', resourceGroup().name, '/providers/Microsoft.Network/loadBalancers/', variables('loadBalancerName'), '/inboundNatPools/', variables('loadBalancerNatPoolName'))]" + } ] + } } + ] } - }, - "dependsOn": [ - "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", - "[concat('Microsoft.Network/virtualNetworks/', variables('vnetName'))]", - "[resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName'))]" + } ] + } } - ] + }, + "dependsOn": [ + "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", + "[concat('Microsoft.Network/virtualNetworks/', variables('vnetName'))]", + "[resourceId('Microsoft.Network/loadBalancers', variables('loadBalancerName'))]" + ] + } + ] } diff --git a/201-vm-linux-comprehensive/azuredeploy.json b/201-vm-linux-comprehensive/azuredeploy.json index 3a368ca..d891813 100644 --- a/201-vm-linux-comprehensive/azuredeploy.json +++ b/201-vm-linux-comprehensive/azuredeploy.json @@ -1,269 +1,273 @@ { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "adminUsername": { - "type": "string", - "metadata": { - "description": "Username for the Virtual Machine." - }, - "defaultValue": "localadmin" - }, - "adminPassword": { - "type": "securestring", - "defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]", - "metadata": { - "description": "Password for the Virtual Machine.Default value is 'Subscription#'" - } - }, - "ubuntuOSVersion": { - "type": "string", - "defaultValue": "14.04.3-LTS", - "metadata": { - "description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version. Default value: 14.04.3-LTS" - } - } + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "adminUsername": { + "type": "string", + "metadata": { + "description": "Username for the Virtual Machine." + }, + "defaultValue": "localadmin" }, - "variables": { - "dnsNameForPublicIP": "[concat('dns', resourceGroup().name)]", - "location": "[resourceGroup().location]", - "imagePublisher": "Canonical", - "imageOffer": "UbuntuServer", - "OSDiskName": "osdisk", - "nicName": "myVnic", - "addressPrefix": "10.0.0.0/24", - "subnetName": "mySubnet", - "subnetPrefix": "10.0.0.0/24", - "storageAccountName": "[concat('sa', resourceGroup().name)]", - "storageAccountType": "Standard_LRS", - "publicIPAddressName": "myPublicIP", - "publicIPAddressType": "Dynamic", - "vmStorageAccountContainerName": "vhds", - "vmName": "[concat('vm', resourceGroup().name)]", - "vmSize": "Standard_A1", - "virtualNetworkName": "myVnet", - "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", - "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", - "networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]" + "adminPassword": { + "type": "securestring", + "defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]", + "metadata": { + "description": "Password for the Virtual Machine.Default value is 'Subscription#'" + } }, - "resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "name": "[toLower(variables('storageAccountName'))]", - "apiVersion": "2015-05-01-preview", - "location": "[variables('location')]", - "properties": { - "accountType": "[variables('storageAccountType')]" - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/networkSecurityGroups", - "name": "[variables('networkSecurityGroupName')]", - "location": "[resourceGroup().location]", - "properties": { - "securityRules": [ - { - "name": "ssh", - "properties": { - "description": "Allow RDP", - "protocol": "Tcp", - "sourcePortRange": "*", - "destinationPortRange": "22", - "sourceAddressPrefix": "*", - "destinationAddressPrefix": "*", - "access": "Allow", - "priority": 200, - "direction": "Inbound" - } - } - ] - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/publicIPAddresses", - "name": "[variables('publicIPAddressName')]", - "location": "[variables('location')]", - "properties": { - "publicIPAllocationMethod": "[variables('publicIPAddressType')]", - "dnsSettings": { - "domainNameLabel": "[variables('dnsNameForPublicIP')]" - } - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/virtualNetworks", - "name": "[variables('virtualNetworkName')]", - "location": "[variables('location')]", - "properties": { - "addressSpace": { - "addressPrefixes": [ - "[variables('addressPrefix')]" - ] - }, - "subnets": [ - { - "name": "[variables('subnetName')]", - "properties": { - "addressPrefix": "[variables('subnetPrefix')]" - } - } - ] - } - }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/networkInterfaces", - "name": "[variables('nicName')]", - "location": "[variables('location')]", - "dependsOn": [ - "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", - "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", - "[variables('networkSecurityGroupName')]" - ], - "properties": { - "networkSecurityGroup": { - "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]" - }, - "ipConfigurations": [ - { - "name": "ipconfig1", - "properties": { - "privateIPAllocationMethod": "Dynamic", - "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]" - }, - "subnet": { - "id": "[variables('subnetRef')]" - } - } - } - ] - } - }, - { - "apiVersion": "2015-06-15", - "type": "Microsoft.Compute/virtualMachines", - "name": "[variables('vmName')]", - "location": "[variables('location')]", - "dependsOn": [ - "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", - "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]" - ], - "properties": { - "hardwareProfile": { - "vmSize": "[variables('vmSize')]" - }, - "osProfile": { - "computerName": "[variables('vmName')]", - "adminUsername": "[parameters('adminUsername')]", - "adminPassword": "[parameters('adminPassword')]" - }, - "storageProfile": { - "imageReference": { - "publisher": "[variables('imagePublisher')]", - "offer": "[variables('imageOffer')]", - "sku": "[parameters('ubuntuOSVersion')]", - "version": "latest" - }, - "osDisk": { - "name": "osdisk", - "vhd": { - "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]" - }, - "caching": "ReadWrite", - "createOption": "FromImage" - } - }, - "networkProfile": { - "networkInterfaces": [ - { - "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]" - } - ] - }, - "diagnosticsProfile": { - "bootDiagnostics": { - "enabled": "true", - "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob]" - } - } - } - }, - { - "type": "Microsoft.Compute/virtualMachines/extensions", - "name": "[concat(variables('vmName'),'/LinuxCustomScriptExtension')]", - "apiVersion": "2015-06-15", - "location": "[resourceGroup().location]", - "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" - ], - "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.3", - "autoUpgradeMinorVersion": "true", - "settings": { - "commandToExecute": "touch /test.txt", - "enableInternalDNSCheck": "false" - } - } - }, - { - "type": "Microsoft.Compute/virtualMachines/extensions", - "name": "[concat(variables('vmName'),'/LinuxVMAccessExtension')]", - "apiVersion": "2015-06-15", - "location": "[resourceGroup().location]", - "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxCustomScriptExtension')]" - ], - "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "VMAccessForLinux", - "typeHandlerVersion": "1.3", - "autoUpgradeMinorVersion": "true", - "settings": { }, - "protectedSettings": { - "username": "[parameters('adminUsername')]", - "password": "[parameters('adminPassword')]" - } - } - }, - { - "type": "Microsoft.Compute/virtualMachines/extensions", - "name": "[concat(variables('vmName'),'/installospatching')]", - "apiVersion": "2015-06-15", - "location": "[resourceGroup().location]", - "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxVMAccessExtension')]" - ], - "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "OSPatchingForLinux", - "typeHandlerVersion": "2.0", - "autoUpgradeMinorVersion": true, - "settings": { - "disabled": false, - "stop": false, - "rebootAfterPatch": "Auto", - "category": "ImportantAndRecommended", - "installDuration": "01:00", - "oneoff": true, - "intervalOfWeeks": "1", - "dayOfWeek": "Sunday", - "startTime": "03:00", - "vmStatusTest": { - "local": false, - "idleTestScript": "", - "healthyTestScript": "" - } - } - } - } - ], - - "outputs": { + "ubuntuOSVersion": { + "type": "string", + "defaultValue": "16.04-LTS", + "allowedValues": [ + "14.04-LTS", + "16.04-LTS" + ], + "metadata": { + "description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version. Default value: 14.04.3-LTS" + } } + }, + "variables": { + "dnsNameForPublicIP": "[concat('dns', resourceGroup().name)]", + "location": "[resourceGroup().location]", + "imagePublisher": "Canonical", + "imageOffer": "UbuntuServer", + "OSDiskName": "osdisk", + "nicName": "myVnic", + "addressPrefix": "10.0.0.0/24", + "subnetName": "mySubnet", + "subnetPrefix": "10.0.0.0/24", + "storageAccountName": "[concat('sa', resourceGroup().name)]", + "storageAccountType": "Standard_LRS", + "publicIPAddressName": "myPublicIP", + "publicIPAddressType": "Dynamic", + "vmStorageAccountContainerName": "vhds", + "vmName": "[concat('vm', resourceGroup().name)]", + "vmSize": "Standard_A1", + "virtualNetworkName": "myVnet", + "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", + "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", + "networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]" + }, + "resources": [ + { + "type": "Microsoft.Storage/storageAccounts", + "name": "[toLower(variables('storageAccountName'))]", + "apiVersion": "2015-05-01-preview", + "location": "[variables('location')]", + "properties": { + "accountType": "[variables('storageAccountType')]" + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/networkSecurityGroups", + "name": "[variables('networkSecurityGroupName')]", + "location": "[resourceGroup().location]", + "properties": { + "securityRules": [ + { + "name": "ssh", + "properties": { + "description": "Allow RDP", + "protocol": "Tcp", + "sourcePortRange": "*", + "destinationPortRange": "22", + "sourceAddressPrefix": "*", + "destinationAddressPrefix": "*", + "access": "Allow", + "priority": 200, + "direction": "Inbound" + } + } + ] + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/publicIPAddresses", + "name": "[variables('publicIPAddressName')]", + "location": "[variables('location')]", + "properties": { + "publicIPAllocationMethod": "[variables('publicIPAddressType')]", + "dnsSettings": { + "domainNameLabel": "[variables('dnsNameForPublicIP')]" + } + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/virtualNetworks", + "name": "[variables('virtualNetworkName')]", + "location": "[variables('location')]", + "properties": { + "addressSpace": { + "addressPrefixes": [ + "[variables('addressPrefix')]" + ] + }, + "subnets": [ + { + "name": "[variables('subnetName')]", + "properties": { + "addressPrefix": "[variables('subnetPrefix')]" + } + } + ] + } + }, + { + "apiVersion": "2015-05-01-preview", + "type": "Microsoft.Network/networkInterfaces", + "name": "[variables('nicName')]", + "location": "[variables('location')]", + "dependsOn": [ + "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", + "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]", + "[variables('networkSecurityGroupName')]" + ], + "properties": { + "networkSecurityGroup": { + "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]" + }, + "ipConfigurations": [ + { + "name": "ipconfig1", + "properties": { + "privateIPAllocationMethod": "Dynamic", + "publicIPAddress": { + "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]" + }, + "subnet": { + "id": "[variables('subnetRef')]" + } + } + } + ] + } + }, + { + "apiVersion": "2015-06-15", + "type": "Microsoft.Compute/virtualMachines", + "name": "[variables('vmName')]", + "location": "[variables('location')]", + "dependsOn": [ + "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]", + "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]" + ], + "properties": { + "hardwareProfile": { + "vmSize": "[variables('vmSize')]" + }, + "osProfile": { + "computerName": "[variables('vmName')]", + "adminUsername": "[parameters('adminUsername')]", + "adminPassword": "[parameters('adminPassword')]" + }, + "storageProfile": { + "imageReference": { + "publisher": "[variables('imagePublisher')]", + "offer": "[variables('imageOffer')]", + "sku": "[parameters('ubuntuOSVersion')]", + "version": "latest" + }, + "osDisk": { + "name": "osdisk", + "vhd": { + "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob, variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]" + }, + "caching": "ReadWrite", + "createOption": "FromImage" + } + }, + "networkProfile": { + "networkInterfaces": [ + { + "id": "[resourceId('Microsoft.Network/networkInterfaces',variables('nicName'))]" + } + ] + }, + "diagnosticsProfile": { + "bootDiagnostics": { + "enabled": "true", + "storageUri": "[reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob]" + } + } + } + }, + { + "type": "Microsoft.Compute/virtualMachines/extensions", + "name": "[concat(variables('vmName'),'/LinuxCustomScriptExtension')]", + "apiVersion": "2015-06-15", + "location": "[resourceGroup().location]", + "dependsOn": [ + "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" + ], + "properties": { + "publisher": "Microsoft.OSTCExtensions", + "type": "CustomScriptForLinux", + "typeHandlerVersion": "1.3", + "autoUpgradeMinorVersion": "true", + "settings": { + "commandToExecute": "touch /test.txt", + "enableInternalDNSCheck": "false" + } + } + }, + { + "type": "Microsoft.Compute/virtualMachines/extensions", + "name": "[concat(variables('vmName'),'/LinuxVMAccessExtension')]", + "apiVersion": "2015-06-15", + "location": "[resourceGroup().location]", + "dependsOn": [ + "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxCustomScriptExtension')]" + ], + "properties": { + "publisher": "Microsoft.OSTCExtensions", + "type": "VMAccessForLinux", + "typeHandlerVersion": "1.3", + "autoUpgradeMinorVersion": "true", + "settings": { }, + "protectedSettings": { + "username": "[parameters('adminUsername')]", + "password": "[parameters('adminPassword')]" + } + } + }, + { + "type": "Microsoft.Compute/virtualMachines/extensions", + "name": "[concat(variables('vmName'),'/installospatching')]", + "apiVersion": "2015-06-15", + "location": "[resourceGroup().location]", + "dependsOn": [ + "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxVMAccessExtension')]" + ], + "properties": { + "publisher": "Microsoft.OSTCExtensions", + "type": "OSPatchingForLinux", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, + "settings": { + "disabled": false, + "stop": false, + "rebootAfterPatch": "Auto", + "category": "ImportantAndRecommended", + "installDuration": "01:00", + "oneoff": true, + "intervalOfWeeks": "1", + "dayOfWeek": "Sunday", + "startTime": "03:00", + "vmStatusTest": { + "local": false, + "idleTestScript": "", + "healthyTestScript": "" + } + } + } + } + ], + + "outputs": { + } } \ No newline at end of file diff --git a/201-vm-windows-comprehensive/azuredeploy.json b/201-vm-windows-comprehensive/azuredeploy.json index 49c7e41..f8161a7 100644 --- a/201-vm-windows-comprehensive/azuredeploy.json +++ b/201-vm-windows-comprehensive/azuredeploy.json @@ -29,7 +29,7 @@ "windowsImageSKU": "2012-R2-Datacenter", "windowsImageVersion": "latest", "dataDiskSize": 2, - "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/201-Comprehensive", + "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/201-vm-windows-comprehensive", "staticSubnetName": "vmstaticsubnet", "virtualNetworkName": "[tolower(concat('vmvnet',resourceGroup().name))]", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]", diff --git a/201-vmss-linux-existing-vnet/azuredeploy.json b/201-vmss-linux-existing-vnet/azuredeploy.json index 948deac..fc9b28e 100644 --- a/201-vmss-linux-existing-vnet/azuredeploy.json +++ b/201-vmss-linux-existing-vnet/azuredeploy.json @@ -54,7 +54,11 @@ }, "osImageSku": { "type": "string", - "defaultValue": "14.04.3-LTS", + "defaultValue": "16.04-LTS", + "allowedValues": [ + "14.04-LTS", + "16.04-LTS" + ], "metadata": { "description": "Maps to the sku in the Azure Stack Platform Image Repository." } diff --git a/201-vmss-linux-extension/azuredeploy.json b/201-vmss-linux-extension/azuredeploy.json index 5211831..bd4fc69 100644 --- a/201-vmss-linux-extension/azuredeploy.json +++ b/201-vmss-linux-extension/azuredeploy.json @@ -54,7 +54,11 @@ }, "osImageSku": { "type": "string", - "defaultValue": "14.04.3-LTS", + "defaultValue": "16.04-LTS", + "allowedValues": [ + "14.04-LTS", + "16.04-LTS" + ], "metadata": { "description": "The Ubuntu version for the VM. This will pick a fully patched image of this given Ubuntu version. Default value: 14.04.3-LTS" } diff --git a/201-vmss-linux-vm-largescale/azuredeploy.json b/201-vmss-linux-vm-largescale/azuredeploy.json index 9b84ad9..2dbfd25 100644 --- a/201-vmss-linux-vm-largescale/azuredeploy.json +++ b/201-vmss-linux-vm-largescale/azuredeploy.json @@ -38,27 +38,31 @@ "description": "Admin password on all VMs." } }, - "osImagePublisher": { - "type": "string", - "defaultValue": "Canonical", - "metadata": { - "description": "Maps to the publisher in the Azure Stack Platform Image Repository manifest file." - } - }, - "osImageOffer": { - "type": "string", - "defaultValue": "UbuntuServer", - "metadata": { - "description": "Maps to the Offer in the Azure Stack Platform Image Repository manifest file." - } - }, - "osImageSku": { - "type": "string", - "defaultValue": "14.04.3-LTS", - "metadata": { - "description": "Maps to the sku in the Azure Stack Platform Image Repository." - } - } + "osImagePublisher": { + "type": "string", + "defaultValue": "Canonical", + "metadata": { + "description": "Maps to the publisher in the Azure Stack Platform Image Repository manifest file." + } + }, + "osImageOffer": { + "type": "string", + "defaultValue": "UbuntuServer", + "metadata": { + "description": "Maps to the Offer in the Azure Stack Platform Image Repository manifest file." + } + }, + "osImageSku": { + "type": "string", + "defaultValue": "16.04-LTS", + "allowedValues": [ + "14.04-LTS", + "16.04-LTS" + ], + "metadata": { + "description": "Maps to the sku in the Azure Stack Platform Image Repository." + } + } }, "variables": { "location": "[resourceGroup().location]", diff --git a/docker-swarm-ubuntu/azuredeploy.json b/docker-swarm-ubuntu/azuredeploy.json index faffc1d..55b2f90 100644 --- a/docker-swarm-ubuntu/azuredeploy.json +++ b/docker-swarm-ubuntu/azuredeploy.json @@ -86,7 +86,7 @@ }, "linuxSku": { "type": "string", - "defaultValue": "14.04.3-LTS", + "defaultValue": "14.04-LTS", "metadata": { "description": "This is the linux sku used by the linux cluster" } diff --git a/mesos-windows-jumpbox/azuredeploy.json b/mesos-windows-jumpbox/azuredeploy.json index f2ca410..b9653f9 100644 --- a/mesos-windows-jumpbox/azuredeploy.json +++ b/mesos-windows-jumpbox/azuredeploy.json @@ -86,7 +86,7 @@ }, "linuxSku": { "type": "string", - "defaultValue": "14.04.3-LTS", + "defaultValue": "14.04-LTS", "metadata": { "description": "This is the linux sku used by the linux cluster" }