From 85313ee423f44dc28c0cf41f3fd4773c62cf9940 Mon Sep 17 00:00:00 2001 From: JesusAlvarezTorres Date: Wed, 2 Nov 2016 12:58:59 -0700 Subject: [PATCH] Vikasnav patch 1 (#189) Merge all the changes from Vikasnav-patch-1. The changes contain removal of Public IP addresses, removal of unwanted parameters and fix bugs --- 101-create-storage-account/azuredeploy.json | 4 +- 101-linux-customscript-ext/azuredeploy.json | 12 +- 101-linux-docker-extension/azuredeploy.json | 11 +- 101-linux-vmaccess-ext/azuredeploy.json | 13 +- .../azuredeploy.parameters.json | 3 - 101-simple-linux-vm/azuredeploy.json | 200 ++++++++---------- 101-simple-windows-vm-diag/azuredeploy.json | 29 +-- .../azuredeploy.parameters.json | 6 - 101-simple-windows-vm/azuredeploy.json | 23 +- 101-two-vm-extensions/azuredeploy.json | 16 +- .../azuredeploy.parameters.json | 5 +- 101-vm-ext-win-cs-cmd/azuredeploy.json | 11 +- .../azuredeploy.parameters.json | 5 +- 101-vm-ext-win-cs-pscmd/azuredeploy.json | 9 +- .../azuredeploy.parameters.json | 5 +- 101-vm-ext-win-cs-scriptfile/azuredeploy.json | 9 +- .../azuredeploy.parameters.json | 3 - 101-vm-extension-bginfo/azuredeploy.json | 9 +- .../azuredeploy.parameters.json | 3 - 101-vm-from-user-image/azuredeploy.json | 18 -- 201-Comprehensive/azuredeploy.json | 4 +- 201-Comprehensive/azuredeploy.parameters.json | 9 +- 201-comprehensive-linux-vm/azuredeploy.json | 6 +- .../azuredeploy.json | 2 +- .../azuredeploy.parameters.json | 3 - ad-join-domain-ext-win/azuredeploy.json | 4 +- ad-non-ha/azuredeploy.json | 2 +- anti-malware-ext-win/azuredeploy.json | 2 +- .../azuredeploy.parameters.json | 3 - bootstorm-vm-boot-time/azuredeploy.json | 22 +- .../azuredeploy.parameters.json | 5 +- iostorm-vm-iops-latency/azuredeploy.json | 22 +- .../azuredeploy.parameters.json | 7 +- sql-2014-non-ha/azuredeploy.parameters.json | 3 - vmaccess-ext-win/azuredeploy.json | 2 +- vs2013-tcta/azuredeploy.json | 4 +- vs2013-tcta/azuredeploy.parameters.json | 2 +- 37 files changed, 213 insertions(+), 283 deletions(-) diff --git a/101-create-storage-account/azuredeploy.json b/101-create-storage-account/azuredeploy.json index 923714a..c57e1be 100644 --- a/101-create-storage-account/azuredeploy.json +++ b/101-create-storage-account/azuredeploy.json @@ -30,4 +30,6 @@ } ], "outputs": {} -} \ No newline at end of file + +} + diff --git a/101-linux-customscript-ext/azuredeploy.json b/101-linux-customscript-ext/azuredeploy.json index 5badce7..57cbda9 100644 --- a/101-linux-customscript-ext/azuredeploy.json +++ b/101-linux-customscript-ext/azuredeploy.json @@ -3,12 +3,12 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply Linux custom script to" - }, - "defaultValue": "[concat('vm', resourceGroup().name)]" - } + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply Linux custom script to" + }, + "defaultValue": "[substring(concat('simplelinuxvm',resourceGroup().Name),0,14)]" + } }, "variables": { }, diff --git a/101-linux-docker-extension/azuredeploy.json b/101-linux-docker-extension/azuredeploy.json index 20518fa..aa791b6 100644 --- a/101-linux-docker-extension/azuredeploy.json +++ b/101-linux-docker-extension/azuredeploy.json @@ -3,13 +3,12 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply Docker extension to" - }, - "defaultValue": "[concat('vm', resourceGroup().name)]" + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply Docker extension to" + }, + "defaultValue": "[substring(concat('simplelinuxvm',resourceGroup().Name),0,14)]" } - }, "variables": { }, diff --git a/101-linux-vmaccess-ext/azuredeploy.json b/101-linux-vmaccess-ext/azuredeploy.json index cfa3a2a..8be79be 100644 --- a/101-linux-vmaccess-ext/azuredeploy.json +++ b/101-linux-vmaccess-ext/azuredeploy.json @@ -3,11 +3,11 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing Linux VM to modify" - }, - "defaultValue": "[concat('vm', resourceGroup().name)]" + "type": "string", + "metadata": { + "description": "Name of the existing Linux VM to modify" + }, + "defaultValue": "[substring(concat('simplelinuxvm',resourceGroup().Name),0,14)]" }, "username": { "type": "string", @@ -19,7 +19,8 @@ "type": "securestring", "metadata": { "description": "Password for new or existing user" - } + }, + "defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]" } }, "variables": { diff --git a/101-linux-vmaccess-ext/azuredeploy.parameters.json b/101-linux-vmaccess-ext/azuredeploy.parameters.json index 6d22aac..22f5a87 100644 --- a/101-linux-vmaccess-ext/azuredeploy.parameters.json +++ b/101-linux-vmaccess-ext/azuredeploy.parameters.json @@ -4,9 +4,6 @@ "parameters": { "username": { "value": "Test" - }, - "password": { - "value": "GEN-PASSWORD" } } } diff --git a/101-simple-linux-vm/azuredeploy.json b/101-simple-linux-vm/azuredeploy.json index 8642fd6..d0556a0 100644 --- a/101-simple-linux-vm/azuredeploy.json +++ b/101-simple-linux-vm/azuredeploy.json @@ -48,10 +48,8 @@ "subnetPrefix": "10.0.0.0/24", "storageAccountName": "[concat('sa', uniquestring(resourceGroup().id))]", "storageAccountType": "Standard_LRS", - "publicIPAddressName": "[tolower(concat('pip',uniquestring(resourceGroup().id)))]", - "publicIPAddressType": "Dynamic", "vmStorageAccountContainerName": "vhds", - "vmName": "[concat('vm', resourceGroup().name)]", + "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'))]", @@ -90,119 +88,103 @@ } } ] - } - }, - { - "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/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-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'))]" + } + ] + } + }, + { + "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" }, - "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": "[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')]" }, - "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)]" + "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-simple-windows-vm-diag/azuredeploy.json b/101-simple-windows-vm-diag/azuredeploy.json index 5a029cc..305d042 100644 --- a/101-simple-windows-vm-diag/azuredeploy.json +++ b/101-simple-windows-vm-diag/azuredeploy.json @@ -2,12 +2,6 @@ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { - "storageAccountNamePrefix": { - "type": "string", - "metadata": { - "description": "Name prefix of the Storage Account. The maximum length of the prefix is 24 characters" - } - }, "vmsuffix": { "type": "string", "metadata": { @@ -31,7 +25,8 @@ "type": "securestring", "metadata": { "description": "Password for the Virtual Machine" - } + }, + "defaultValue": "[concat('Subscription#',subscription().subscriptionId)]" }, "windowsOSVersion": { "type": "string", @@ -47,7 +42,7 @@ "variables": { "storage": { "storageAccounts": { - "name": "[replace(replace(tolower(parameters('storageAccountNamePrefix')), '-',''),'.','')]", + "name": "[concat('sa', uniquestring(resourceGroup().id))]", "type": "Standard_LRS" } }, @@ -58,8 +53,6 @@ "addressPrefix": "10.0.0.0/24", "subnetName": "Subnet", "subnetPrefix": "10.0.0.0/24", - "publicIPAddressName": "[concat('myip', parameters('vmsuffix'))]", - "publicIPAddressType": "Dynamic", "vmStorageAccountContainerName": "vhds", "vmName": "[concat('myvm', parameters('vmsuffix'))]", "vmSize": "Standard_A1", @@ -113,18 +106,6 @@ "accountType": "[variables('storage').storageAccounts.type]" } }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/publicIPAddresses", - "name": "[variables('publicIPAddressName')]", - "location": "[resourceGroup().location]", - "properties": { - "publicIPAllocationMethod": "[variables('publicIPAddressType')]", - "dnsSettings": { - "domainNameLabel": "[variables('dnsNameForPublicIP')]" - } - } - }, { "apiVersion": "2015-05-01-preview", "type": "Microsoft.Network/virtualNetworks", @@ -161,7 +142,6 @@ "name": "[variables('nicName')]", "location": "[resourceGroup().location]", "dependsOn": [ - "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]" ], "properties": { @@ -170,9 +150,6 @@ "name": "ipconfig1", "properties": { "privateIPAllocationMethod": "Dynamic", - "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]" - }, "subnet": { "id": "[variables('subnetRef')]" } diff --git a/101-simple-windows-vm-diag/azuredeploy.parameters.json b/101-simple-windows-vm-diag/azuredeploy.parameters.json index aa3c0ce..1afad08 100644 --- a/101-simple-windows-vm-diag/azuredeploy.parameters.json +++ b/101-simple-windows-vm-diag/azuredeploy.parameters.json @@ -5,12 +5,6 @@ "vmsuffix": { "value": "myVM" }, - "adminPassword": { - "value": "GEN-PASSWORD" - }, - "storageAccountNamePrefix": { - "value": "DiagStor" - }, "windowsOSVersion": { "value": "2012-R2-Datacenter" }, diff --git a/101-simple-windows-vm/azuredeploy.json b/101-simple-windows-vm/azuredeploy.json index c8be283..5bb23da 100644 --- a/101-simple-windows-vm/azuredeploy.json +++ b/101-simple-windows-vm/azuredeploy.json @@ -7,14 +7,14 @@ "metadata": { "description": "Unique DNS Name for the Storage Account where the Virtual Machine's disks will be placed." }, - "defaultValue": "[substring(concat('vm',uniquestring(replace(resourceGroup().Id,'-',''))),0,8)]" + "defaultValue": "[substring(concat('vm',uniquestring(replace(resourceGroup().Id,'-',''))),0,8)]" }, "vmName": { "type": "string", "metadata": { "description": "Name of the VM." }, - "defaultValue": "[substring(replace(replace(tolower(concat('vm',resourceGroup().name)), '-', ''), '.',''),0,8)]" + "defaultValue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" }, "adminUsername": { "type": "string", @@ -60,8 +60,6 @@ "subnetName": "[replace(replace(tolower(concat('subnet',resourceGroup().name)), '-', ''), '.','')]", "subnetPrefix": "10.0.0.0/24", "storageAccountType": "Standard_LRS", - "publicIPAddressName": "[replace(replace(tolower(concat('pip',resourceGroup().name)), '-', ''), '.','')]", - "publicIPAddressType": "Dynamic", "vmStorageAccountContainerName": "vhds", "vmSize": "Standard_A1", "virtualNetworkName": "[replace(replace(tolower(concat('vnet',resourceGroup().name)), '-', ''), '.','')]", @@ -105,18 +103,6 @@ "accountType": "[variables('storageAccountType')]" } }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/publicIPAddresses", - "name": "[variables('publicIPAddressName')]", - "location": "[variables('location')]", - "properties": { - "publicIPAllocationMethod": "[variables('publicIPAddressType')]", - "dnsSettings": { - "domainNameLabel": "[parameters('dnsNameForPublicIP')]" - } - } - }, { "apiVersion": "2015-05-01-preview", "type": "Microsoft.Network/virtualNetworks", @@ -150,7 +136,7 @@ "name": "[variables('nicName')]", "location": "[variables('location')]", "dependsOn": [ - "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", + "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]" ], "properties": { @@ -159,9 +145,6 @@ "name": "ipconfig1", "properties": { "privateIPAllocationMethod": "Dynamic", - "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]" - }, "subnet": { "id": "[variables('subnetRef')]" } diff --git a/101-two-vm-extensions/azuredeploy.json b/101-two-vm-extensions/azuredeploy.json index 60e6e29..c975a92 100644 --- a/101-two-vm-extensions/azuredeploy.json +++ b/101-two-vm-extensions/azuredeploy.json @@ -3,10 +3,11 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply the VM Extensions to" - } + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply the VM Extensions to" + }, + "defaultValue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" } }, "variables": { @@ -21,9 +22,10 @@ "publisher": "Microsoft.Compute", "type": "CustomScriptExtension", "typeHandlerVersion": "1.8", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "settings": { - "commandToExecute": "md c:\\users\\public\\documents\\test" + "commandToExecute": "md c:\\users\\public\\documents\\test", + "fileUris": [] } } }, @@ -36,7 +38,7 @@ "publisher": "Microsoft.Compute", "type": "BGInfo", "typeHandlerVersion": "2.1", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "settings": { "Properties": [ ] diff --git a/101-two-vm-extensions/azuredeploy.parameters.json b/101-two-vm-extensions/azuredeploy.parameters.json index 114e4cb..602f9db 100644 --- a/101-two-vm-extensions/azuredeploy.parameters.json +++ b/101-two-vm-extensions/azuredeploy.parameters.json @@ -2,8 +2,5 @@ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { - "vmName": { - "value": "myVM001" - } } -} \ No newline at end of file +} diff --git a/101-vm-ext-win-cs-cmd/azuredeploy.json b/101-vm-ext-win-cs-cmd/azuredeploy.json index c9cc6cb..26621ed 100644 --- a/101-vm-ext-win-cs-cmd/azuredeploy.json +++ b/101-vm-ext-win-cs-cmd/azuredeploy.json @@ -3,10 +3,11 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply the custom script to" - } + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply the custom script to" + }, + "defaultvalue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" } }, "variables": { @@ -21,7 +22,7 @@ "publisher": "Microsoft.Compute", "type": "CustomScriptExtension", "typeHandlerVersion": "1.8", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "settings": { "commandToExecute": "md c:\\users\\public\\documents\\test" } diff --git a/101-vm-ext-win-cs-cmd/azuredeploy.parameters.json b/101-vm-ext-win-cs-cmd/azuredeploy.parameters.json index 114e4cb..602f9db 100644 --- a/101-vm-ext-win-cs-cmd/azuredeploy.parameters.json +++ b/101-vm-ext-win-cs-cmd/azuredeploy.parameters.json @@ -2,8 +2,5 @@ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { - "vmName": { - "value": "myVM001" - } } -} \ No newline at end of file +} diff --git a/101-vm-ext-win-cs-pscmd/azuredeploy.json b/101-vm-ext-win-cs-pscmd/azuredeploy.json index 76e028b..870bdb8 100644 --- a/101-vm-ext-win-cs-pscmd/azuredeploy.json +++ b/101-vm-ext-win-cs-pscmd/azuredeploy.json @@ -3,10 +3,11 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply the custom script to" - } + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply the custom script to" + }, + "defaultvalue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" } }, "variables": { diff --git a/101-vm-ext-win-cs-pscmd/azuredeploy.parameters.json b/101-vm-ext-win-cs-pscmd/azuredeploy.parameters.json index 114e4cb..602f9db 100644 --- a/101-vm-ext-win-cs-pscmd/azuredeploy.parameters.json +++ b/101-vm-ext-win-cs-pscmd/azuredeploy.parameters.json @@ -2,8 +2,5 @@ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { - "vmName": { - "value": "myVM001" - } } -} \ No newline at end of file +} diff --git a/101-vm-ext-win-cs-scriptfile/azuredeploy.json b/101-vm-ext-win-cs-scriptfile/azuredeploy.json index 38fe622..f6cc6b9 100644 --- a/101-vm-ext-win-cs-scriptfile/azuredeploy.json +++ b/101-vm-ext-win-cs-scriptfile/azuredeploy.json @@ -3,10 +3,11 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply the custom script to" - } + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply the custom script to" + }, + "defaultvalue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" }, "scriptFile": { "type": "string", diff --git a/101-vm-ext-win-cs-scriptfile/azuredeploy.parameters.json b/101-vm-ext-win-cs-scriptfile/azuredeploy.parameters.json index 450829f..3f24040 100644 --- a/101-vm-ext-win-cs-scriptfile/azuredeploy.parameters.json +++ b/101-vm-ext-win-cs-scriptfile/azuredeploy.parameters.json @@ -2,9 +2,6 @@ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { - "vmName": { - "value": "myVM001" - }, "scriptFile": { "value": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/101-vm-ext-win-cs-scriptfile/VMCustomScriptExtension.ps1" }, diff --git a/101-vm-extension-bginfo/azuredeploy.json b/101-vm-extension-bginfo/azuredeploy.json index e2a280f..25b7b34 100644 --- a/101-vm-extension-bginfo/azuredeploy.json +++ b/101-vm-extension-bginfo/azuredeploy.json @@ -3,10 +3,11 @@ "contentVersion": "1.0.0.0", "parameters": { "vmName": { - "type": "string", - "metadata": { - "description": "Name of the existing VM to apply BGInfo to" - } + "type": "string", + "metadata": { + "description": "Name of the existing VM to apply BGInfo to" + }, + "defaultValue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" } }, "variables": { diff --git a/101-vm-extension-bginfo/azuredeploy.parameters.json b/101-vm-extension-bginfo/azuredeploy.parameters.json index e639280..602f9db 100644 --- a/101-vm-extension-bginfo/azuredeploy.parameters.json +++ b/101-vm-extension-bginfo/azuredeploy.parameters.json @@ -2,8 +2,5 @@ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { - "vmName": { - "value": "myVM001" - } } } diff --git a/101-vm-from-user-image/azuredeploy.json b/101-vm-from-user-image/azuredeploy.json index e3deb74..4596c61 100644 --- a/101-vm-from-user-image/azuredeploy.json +++ b/101-vm-from-user-image/azuredeploy.json @@ -63,14 +63,12 @@ } }, "variables": { - "publicIPAddressName": "[concat(parameters('vmName'),'PublicIP')]", "vmName": "[parameters('vmName')]", "virtualNetworkName": "[concat(parameters('vmName'),'VNet')]", "nicName": "[concat(parameters('vmName'),'Nic')]", "addressPrefix": "10.0.0.0/24", "subnet1Name": "mysubnet", "subnet1Prefix": "10.0.0.0/24", - "publicIPAddressType": "Dynamic", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", "subnet1Ref": "[concat(variables('vnetID'),'/subnets/',variables('subnet1Name'))]", "networkSecurityGroupName": "SecurityGroup", @@ -106,18 +104,6 @@ ] } }, - { - "apiVersion": "2015-05-01-preview", - "type": "Microsoft.Network/publicIPAddresses", - "name": "[variables('publicIPAddressName')]", - "location": "[resourceGroup().location]", - "properties": { - "publicIPAllocationMethod": "[variables('publicIPAddressType')]", - "dnsSettings": { - "domainNameLabel": "[parameters('dnsNameForPublicIP')]" - } - } - }, { "apiVersion": "2015-05-01-preview", "type": "Microsoft.Network/virtualNetworks", @@ -151,7 +137,6 @@ "name": "[variables('nicName')]", "location": "[resourceGroup().location]", "dependsOn": [ - "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]" ], "properties": { @@ -160,9 +145,6 @@ "name": "ipconfig1", "properties": { "privateIPAllocationMethod": "Dynamic", - "publicIPAddress": { - "id": "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIPAddressName'))]" - }, "subnet": { "id": "[variables('subnet1Ref')]" } diff --git a/201-Comprehensive/azuredeploy.json b/201-Comprehensive/azuredeploy.json index 8de293f..1067593 100644 --- a/201-Comprehensive/azuredeploy.json +++ b/201-Comprehensive/azuredeploy.json @@ -34,7 +34,7 @@ "virtualNetworkName": "[tolower(concat('vmvnet',resourceGroup().name))]", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]", "staticSubnetRef": "[concat(variables('vnetID'),'/subnets/',variables('staticSubnetName'))]", - "storageName": "[tolower(concat('vmsa', resourceGroup().name))]", + "storageName": "[concat('sa', uniquestring(resourceGroup().id))]", "publicLBName": "[tolower(concat('vmplb', resourceGroup().name))]", "publicIPAddressName": "[tolower(concat('vmpip',resourceGroup().name))]", "lbFE": "[tolower(concat('vmlbfe',resourceGroup().name))]", @@ -338,4 +338,4 @@ } ], "outputs": { } -} +} \ No newline at end of file diff --git a/201-Comprehensive/azuredeploy.parameters.json b/201-Comprehensive/azuredeploy.parameters.json index 214ec30..2b1a572 100644 --- a/201-Comprehensive/azuredeploy.parameters.json +++ b/201-Comprehensive/azuredeploy.parameters.json @@ -1,12 +1,5 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json", "contentVersion": "1.0.0.0", - "parameters": { - "adminUsername": { - "value": "lcladmin" - }, - "adminPassword": { - "value": "GEN-PASSWORD" - } - } + "parameters": { } diff --git a/201-comprehensive-linux-vm/azuredeploy.json b/201-comprehensive-linux-vm/azuredeploy.json index 0b46845..34997c6 100644 --- a/201-comprehensive-linux-vm/azuredeploy.json +++ b/201-comprehensive-linux-vm/azuredeploy.json @@ -220,7 +220,7 @@ "apiVersion": "2015-06-15", "location": "[resourceGroup().location]", "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" + "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxCustomScriptExtension')]" ], "properties": { "publisher": "Microsoft.Azure.Extensions", @@ -239,7 +239,7 @@ "apiVersion": "2015-06-15", "location": "[resourceGroup().location]", "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" + "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxDockerExtension')]" ], "properties": { "publisher": "Microsoft.OSTCExtensions", @@ -259,7 +259,7 @@ "apiVersion": "2015-06-15", "location": "[resourceGroup().location]", "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" + "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'),'/extensions/LinuxVMAccessExtension')]" ], "properties": { "publisher": "Microsoft.OSTCExtensions", diff --git a/MicrosoftMonitoringAgent-ext-win/azuredeploy.json b/MicrosoftMonitoringAgent-ext-win/azuredeploy.json index 3722414..a4b0e16 100644 --- a/MicrosoftMonitoringAgent-ext-win/azuredeploy.json +++ b/MicrosoftMonitoringAgent-ext-win/azuredeploy.json @@ -7,7 +7,7 @@ "metadata": { "description": "Name of an existing Windows VM to update" }, - "defaultValue": "MyWindowsVM" + "defaultValue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" }, "workspaceId": { "type": "string", diff --git a/MicrosoftMonitoringAgent-ext-win/azuredeploy.parameters.json b/MicrosoftMonitoringAgent-ext-win/azuredeploy.parameters.json index 59800fa..f2fb765 100644 --- a/MicrosoftMonitoringAgent-ext-win/azuredeploy.parameters.json +++ b/MicrosoftMonitoringAgent-ext-win/azuredeploy.parameters.json @@ -2,9 +2,6 @@ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { - "vmName": { - "value": "MyWindowsVM" - }, "workspaceId": { "value": "" }, diff --git a/ad-join-domain-ext-win/azuredeploy.json b/ad-join-domain-ext-win/azuredeploy.json index fb04e56..c26a4b7 100644 --- a/ad-join-domain-ext-win/azuredeploy.json +++ b/ad-join-domain-ext-win/azuredeploy.json @@ -7,7 +7,7 @@ "metadata": { "description": "Name of the Virtual Machine to be created" }, - "defaultValue": "[concat('myvm',resourceGroup().name)]" + "defaultValue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" }, "adminUsername": { "type": "string", @@ -204,7 +204,7 @@ "publisher": "Microsoft.Compute", "type": "JsonADDomainExtension", "typeHandlerVersion": "1.3", - "autoUpgradeMinorVersion": "true", + "autoUpgradeMinorVersion": true, "settings": { "Name": "[parameters('domainToJoin')]", "OUPath": "[parameters('ouToJoin')]", diff --git a/ad-non-ha/azuredeploy.json b/ad-non-ha/azuredeploy.json index 016a597..5fde7df 100644 --- a/ad-non-ha/azuredeploy.json +++ b/ad-non-ha/azuredeploy.json @@ -36,7 +36,7 @@ "dnsPrefix": "[tolower(concat(resourceGroup().name,'dc'))]", "adVmDeployment": "CreateADVMs", "adVmDeploymentId": "[concat('Microsoft.Resources/deployments/', variables('adVmDeployment'))]", - "adPDCVMName": "[concat('AD',resourceGroup().name)]", + "adPDCVMName": "[substring(concat('ADVM',resourceGroup().Name),0,5)]", "deployPrimaryAdTemplateURL": "[concat(variables('assetLocation'),'/deployPrimaryAD.json')]", "deployPrimaryAd": "ConfigureAD", "deployPrimaryAdId": "[concat('Microsoft.Resources/deployments/', variables('deployPrimaryAd'))]", diff --git a/anti-malware-ext-win/azuredeploy.json b/anti-malware-ext-win/azuredeploy.json index dd76fc4..c0d1d8a 100644 --- a/anti-malware-ext-win/azuredeploy.json +++ b/anti-malware-ext-win/azuredeploy.json @@ -18,7 +18,7 @@ } }, "variables": { - "vmName": "[concat(resourceGroup().name,'-am')]", + "vmName": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]", "vmExtensionName": "IaaSAntimalware", "storageAccountName": "[toLower(concat(resourceGroup().name,'amsa'))]", "storageAccountType": "Standard_LRS", diff --git a/anti-malware-ext-win/azuredeploy.parameters.json b/anti-malware-ext-win/azuredeploy.parameters.json index 6f52ad7..587225c 100644 --- a/anti-malware-ext-win/azuredeploy.parameters.json +++ b/anti-malware-ext-win/azuredeploy.parameters.json @@ -4,9 +4,6 @@ "parameters": { "adminUsername": { "value": "Administrator" - }, - "adminPassword": { - "value": "GEN-PASSWORD" } } } diff --git a/bootstorm-vm-boot-time/azuredeploy.json b/bootstorm-vm-boot-time/azuredeploy.json index 03840d6..5585790 100644 --- a/bootstorm-vm-boot-time/azuredeploy.json +++ b/bootstorm-vm-boot-time/azuredeploy.json @@ -27,6 +27,23 @@ "metadata": { "description": "Number of VMs to create." } + }, + "vmSize": { + "type": "string", + "defaultValue": "Standard_A2", + "allowedValues": [ + "Standard_A0", + "Standard_A1", + "Standard_A2", + "Standard_A3", + "Standard_A4", + "Standard_A5", + "Standard_A6", + "Standard_A7" + ], + "metadata": { + "description": "VM size supported by Azure Stack." + } } }, "variables": { @@ -44,7 +61,6 @@ "vmAdminPassword": "pwd0a!8b7", "vmName": "[concat('vm', resourceGroup().name)]", "vmOsDiskName": "[concat('od', resourceGroup().name)]", - "vmSize": "Standard_A2", "vmNicName": "[concat('nc', resourceGroup().name)]", "virtualNetworkName": "[concat('vn', resourceGroup().name)]", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", @@ -173,7 +189,7 @@ ], "properties": { "hardwareProfile": { - "vmSize": "[variables('vmSize')]" + "vmSize": "[parameters('vmSize')]" }, "osProfile": { "computerName": "[variables('vmName')]", @@ -226,7 +242,7 @@ ], "properties": { "hardwareProfile": { - "vmSize": "[variables('vmSize')]" + "vmSize": "[parameters('vmSize')]" }, "osProfile": { "computerName": "[variables('vmName')]", diff --git a/bootstorm-vm-boot-time/azuredeploy.parameters.json b/bootstorm-vm-boot-time/azuredeploy.parameters.json index 32566bf..68bab09 100644 --- a/bootstorm-vm-boot-time/azuredeploy.parameters.json +++ b/bootstorm-vm-boot-time/azuredeploy.parameters.json @@ -12,7 +12,10 @@ "value": "AZURE-AD-ACCOUNT-TENANT-ID" }, "vmCount": { - "value": 5 + "value": 2 + }, + "vmSize": { + "value": "Standard_A1" } } } \ No newline at end of file diff --git a/iostorm-vm-iops-latency/azuredeploy.json b/iostorm-vm-iops-latency/azuredeploy.json index 7527621..26253f7 100644 --- a/iostorm-vm-iops-latency/azuredeploy.json +++ b/iostorm-vm-iops-latency/azuredeploy.json @@ -20,6 +20,23 @@ "description": "The Windows version for the VM." } }, + "vmSize": { + "type": "string", + "defaultValue": "Standard_A2", + "allowedValues": [ + "Standard_A0", + "Standard_A1", + "Standard_A2", + "Standard_A3", + "Standard_A4", + "Standard_A5", + "Standard_A6", + "Standard_A7" + ], + "metadata": { + "description": "VM size supported by Azure Stack." + } + }, "vmDataDiskSizeInGB": { "type": "int", "defaultValue": 5, @@ -71,7 +88,6 @@ "vmName": "[concat('vm', resourceGroup().name)]", "vmOsDiskName": "[concat('od', resourceGroup().name)]", "vmDataDiskName": "[concat('dd', resourceGroup().name)]", - "vmSize": "Standard_A2", "vmNicName": "[tolower(concat('nc', resourceGroup().name))]", "virtualNetworkName": "[tolower(concat('vn', resourceGroup().name))]", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", @@ -203,7 +219,7 @@ ], "properties": { "hardwareProfile": { - "vmSize": "[variables('vmSize')]" + "vmSize": "[parameters('vmSize')]" }, "osProfile": { "computerName": "[variables('vmName')]", @@ -257,7 +273,7 @@ ], "properties": { "hardwareProfile": { - "vmSize": "[variables('vmSize')]" + "vmSize": "[parameters('vmSize')]" }, "osProfile": { "computerName": "[variables('vmName')]", diff --git a/iostorm-vm-iops-latency/azuredeploy.parameters.json b/iostorm-vm-iops-latency/azuredeploy.parameters.json index 0119a09..b340609 100644 --- a/iostorm-vm-iops-latency/azuredeploy.parameters.json +++ b/iostorm-vm-iops-latency/azuredeploy.parameters.json @@ -3,7 +3,10 @@ "contentVersion": "1.16.07.29", "parameters": { "vmCount": { - "value": 5 + "value": 2 + }, + "vmSize": { + "value": "Standard_A1" } } -} \ No newline at end of file +} diff --git a/sql-2014-non-ha/azuredeploy.parameters.json b/sql-2014-non-ha/azuredeploy.parameters.json index 3739862..c7766fb 100644 --- a/sql-2014-non-ha/azuredeploy.parameters.json +++ b/sql-2014-non-ha/azuredeploy.parameters.json @@ -11,9 +11,6 @@ "adminUsername": { "value": "lcladmin" }, - "adminPassword": { - "value": "GEN-PASSWORD" - }, "sqlInstallationISOUri": { "value": "http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso" } diff --git a/vmaccess-ext-win/azuredeploy.json b/vmaccess-ext-win/azuredeploy.json index 386e23f..87ff10d 100644 --- a/vmaccess-ext-win/azuredeploy.json +++ b/vmaccess-ext-win/azuredeploy.json @@ -7,7 +7,7 @@ "metadata": { "description": "Name of an existing Windows VM to update" }, - "defaultValue": "MyWindowsVM" + "defaultValue": "[substring(concat('simplewinvm',resourceGroup().Name),0,12)]" }, "userName": { "type": "string", diff --git a/vs2013-tcta/azuredeploy.json b/vs2013-tcta/azuredeploy.json index d9ef0a4..2fb4650 100644 --- a/vs2013-tcta/azuredeploy.json +++ b/vs2013-tcta/azuredeploy.json @@ -73,7 +73,7 @@ }, "defaultValue": 1 }, - "VisualStudio2013UltimateProductKey": { + "VisualStudioProductKey": { "type": "string", "metadata": { "description": "Product key (25 characters no spaces) for Visual Studio activation" @@ -270,7 +270,7 @@ "controllerServiceUserName": { "value": "[parameters('serviceAccountUserName')]" }, "controllerServicePassword": { "value": "[parameters('serviceAccountPassword')]" }, "assetLocation": { "value": "[variables('assetLocation')]" }, - "VisualStudioProductKey": { "value": "[parameters('VisualStudio2013UltimateProductKey')]" } + "VisualStudioProductKey": { "value": "[parameters('VisualStudioProductKey')]" } } } }, diff --git a/vs2013-tcta/azuredeploy.parameters.json b/vs2013-tcta/azuredeploy.parameters.json index d2a75d5..8c64ac6 100644 --- a/vs2013-tcta/azuredeploy.parameters.json +++ b/vs2013-tcta/azuredeploy.parameters.json @@ -2,7 +2,7 @@ "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json", "contentVersion": "1.0.0.0", "parameters": { - "VisualStudio2013UltimateProductKey": { + "VisualStudioProductKey": { "value": "" } }