Revert "Fix VS code editor issues"

This reverts commit 941126fee8.
This commit is contained in:
vikasnav 2016-09-27 12:00:34 -07:00
Родитель 941126fee8
Коммит c9ff056e95
13 изменённых файлов: 244 добавлений и 244 удалений

Просмотреть файл

@ -248,7 +248,7 @@
"autoUpgradeMinorVersion": true,
"settings": {
"xmlCfg": "[base64(concat(variables('wadcfgxstart'), variables('wadmetricsresourceid'), variables('vmName'), variables('wadcfgxend')))]",
"StorageAccount": "[variables('existingdiagnosticsStorageAccountName')]"
"storageAccount": "[variables('existingdiagnosticsStorageAccountName')]"
},
"protectedSettings": {
"storageAccountName": "[variables('existingdiagnosticsStorageAccountName')]",

Просмотреть файл

@ -21,10 +21,9 @@
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",
"typeHandlerVersion": "1.8",
"autoUpgradeMinorVersion": true,
"autoUpgradeMinorVersion": "true",
"settings": {
"commandToExecute": "md c:\\users\\public\\documents\\test",
"fileUris": []
"commandToExecute": "md c:\\users\\public\\documents\\test"
}
}
},
@ -37,12 +36,10 @@
"publisher": "Microsoft.Compute",
"type": "BGInfo",
"typeHandlerVersion": "2.1",
"autoUpgradeMinorVersion": true,
"autoUpgradeMinorVersion": "true",
"settings": {
"fileUris": [ ],
"commandToExecute": "",
"Properties": [
]
"Properties": [
]
}
}
}

Просмотреть файл

@ -21,10 +21,9 @@
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",
"typeHandlerVersion": "1.8",
"autoUpgradeMinorVersion": true,
"autoUpgradeMinorVersion": "true",
"settings": {
"commandToExecute": "md c:\\users\\public\\documents\\test",
"fileUris": []
"commandToExecute": "md c:\\users\\public\\documents\\test"
}
}
}

Просмотреть файл

@ -21,10 +21,9 @@
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",
"typeHandlerVersion": "1.8",
"autoUpgradeMinorVersion": true,
"autoUpgradeMinorVersion": "true",
"settings": {
"commandToExecute": "powershell -ExecutionPolicy Unrestricted Set-DnsClientServerAddress -InterfaceAlias Ethernet -ServerAddresses 192.168.100.2, 8.8.8.8",
"fileUris": []
"commandToExecute": "powershell -ExecutionPolicy Unrestricted Set-DnsClientServerAddress -InterfaceAlias Ethernet -ServerAddresses 192.168.100.2, 8.8.8.8"
}
}
}

Просмотреть файл

@ -33,7 +33,7 @@
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",
"typeHandlerVersion": "1.8",
"autoUpgradeMinorVersion": true,
"autoUpgradeMinorVersion": "true",
"settings": {
"fileUris": [ "[parameters('scriptFile')]" ],
"commandToExecute": "[concat('powershell -ExecutionPolicy Unrestricted -file ',parameters('scriptName'))]"

Просмотреть файл

@ -210,12 +210,7 @@
"scanType": "Quick",
"day": "7",
"time": "120"
},
"Exclusions": {
"Extensions": "",
"Paths": "",
"Processes": ""
}
}
}
}

Просмотреть файл

@ -637,7 +637,7 @@
"vmSize": "[variables('agentVMSize')]"
},
"osProfile": {
"computerName": "[concat(variables('agentVMNamePrefix'), copyIndex())]",
"computername": "[concat(variables('agentVMNamePrefix'), copyIndex())]",
"adminUsername": "[variables('adminUsername')]",
"adminPassword": "[variables('adminPassword')]",
"linuxConfiguration": "[variables('linuxConfiguration')]"

Просмотреть файл

@ -377,7 +377,7 @@
"vmSize": "[variables('jumpboxVMSize')]"
},
"osProfile": {
"computerName": "[variables('jumpboxVMName')]",
"computername": "[variables('jumpboxVMName')]",
"adminUsername": "[variables('windowsAdminUsername')]",
"adminPassword": "[variables('windowsAdminPassword')]"
},

Просмотреть файл

@ -66,6 +66,8 @@
"uniqueStorageAccountContainerName": "[concat('sc', resourceGroup().name)]",
"imagePublisher": "MicrosoftWindowsServer",
"imageOffer": "WindowsServer",
"vnetAddressRange": "10.0.0.0/16",
"subnetAddressRange": "10.0.0.0/24",
"dnsServerPrivateIp": "10.0.0.4",
"subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',parameters('adVnetName')),'/subnets/',parameters('adSubnetName'))]",
"publicIpRef": "publicIp",
@ -123,22 +125,19 @@
"apiVersion": "2015-06-15",
"type": "Microsoft.Compute/availabilitySets",
"name": "gw-availabilityset",
"location": "[resourceGroup().location]",
"properties": {}
"location": "[resourceGroup().location]"
},
{
"apiVersion": "2015-06-15",
"type": "Microsoft.Compute/availabilitySets",
"name": "cb-availabilityset",
"location": "[resourceGroup().location]",
"properties": {}
"location": "[resourceGroup().location]"
},
{
"apiVersion": "2015-06-15",
"type": "Microsoft.Compute/availabilitySets",
"name": "rdsh-availabilityset",
"location": "[resourceGroup().location]",
"properties": {}
"location": "[resourceGroup().location]"
},
{
"apiVersion": "2015-06-15",
@ -345,7 +344,7 @@
"resources": [
{
"apiVersion": "2015-06-15",
"type": "extensions",
"type": "Microsoft.Compute/virtualMachines/extensions",
"name": "gw-vm/gateway",
"location": "[resourceGroup().location]",
"dependsOn": [
@ -430,7 +429,7 @@
"resources": [
{
"apiVersion": "2015-06-15",
"type": "extensions",
"type": "Microsoft.Compute/virtualMachines/extensions",
"name": "[concat('rdsh-', copyindex(),'/sessionhost')]",
"location": "[resourceGroup().location]",
"dependsOn": [

Просмотреть файл

@ -183,7 +183,7 @@
},
"name": "[concat(parameters('vmName'), '0','data-1.vhd')]",
"caching": "None",
"createOption": "Empty",
"createOption": "empty",
"diskSizeGB": "[parameters('dataDiskSize')]",
"lun": 0
},
@ -193,7 +193,7 @@
},
"name": "[concat(parameters('vmName'), '0','log-1.vhd')]",
"caching": "None",
"createOption": "Empty",
"createOption": "empty",
"diskSizeGB": "[parameters('dataDiskSize')]",
"lun": 1
}

Просмотреть файл

@ -66,7 +66,7 @@
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",
"typeHandlerVersion": "1.8",
"autoUpgradeMinorVersion": true,
"autoUpgradeMinorVersion": "true",
"settings": {
"fileUris": [
"[variables('DownloadLoadTestPackageScriptURL')]",

Просмотреть файл

@ -87,6 +87,17 @@
}
},
"variables": {
"apiVersion": {
"storage": {
"storageAccounts": "2015-06-15"
},
"compute": {
"virtualMachines": "2015-06-15"
},
"network": {
"virtualNetworks": "2015-05-01-preview"
}
},
"location": "[resourceGroup().location]",
"vmContainerName": "vhds"
@ -96,7 +107,7 @@
"name": "[parameters('storageAccount')]",
"type": "Microsoft.Storage/storageAccounts",
"location": "[variables('location')]",
"apiVersion": "2015-06-15",
"apiVersion": "[variables('apiVersion').storage.storageAccounts]",
"properties": {
"accountType": "[parameters('storageAccountType')]"
}
@ -105,7 +116,7 @@
"name": "[parameters('sqlNicName')]",
"type": "Microsoft.Network/networkInterfaces",
"location": "[variables('location')]",
"apiVersion": "2015-05-01-preview",
"apiVersion": "[variables('apiVersion').network.virtualNetworks]",
"properties": {
"ipConfigurations": [
{
@ -124,7 +135,7 @@
"name": "[parameters('vmName')]",
"type": "Microsoft.Compute/virtualMachines",
"location": "[variables('location')]",
"apiVersion": "2015-06-15",
"apiVersion": "[variables('apiVersion').compute.virtualMachines]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccount'))]",
"[resourceId('Microsoft.Network/networkInterfaces',parameters('sqlNicName'))]"
@ -160,7 +171,7 @@
},
"name": "[concat(parameters('vmName'), '0','data-1.vhd')]",
"caching": "None",
"createOption": "Empty",
"createOption": "empty",
"diskSizeGB": "[parameters('sqlDiskSize')]",
"lun": 0
},
@ -170,7 +181,7 @@
},
"name": "[concat(parameters('vmName'), '0','log-1.vhd')]",
"caching": "None",
"createOption": "Empty",
"createOption": "empty",
"diskSizeGB": "[parameters('sqlDiskSize')]",
"lun": 1
}

Просмотреть файл

@ -2,221 +2,221 @@
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"vmNamePrefix": {
"type": "string",
"metadata": {
"description": "The Prefix of the VM Name"
},
"defaultValue": "TAVM"
},
"vmNamePrefix": {
"type": "string",
"metadata": {
"description": "The Prefix of the VM Name"
},
"defaultValue": "TAVM"
},
"windowsImagePublisher": {
"type": "string",
"metadata": {
"description": "The Publisher of Windows Image"
},
"defaultValue": "MicrosoftWindowsServer"
},
"windowsImageOffer": {
"type": "string",
"metadata": {
"description": "The offer of Windows Image"
},
"defaultValue": "WindowsServer"
},
"windowsImageSKU": {
"type": "string",
"metadata": {
"description": "The SKU Name of Windows Image"
},
"defaultValue": "2012-R2-Datacenter"
},
"windowsImagePublisher": {
"type": "string",
"metadata": {
"description": "The Publisher of Windows Image"
},
"defaultValue": "MicrosoftWindowsServer"
},
"windowsImageOffer": {
"type": "string",
"metadata": {
"description": "The offer of Windows Image"
},
"defaultValue": "WindowsServer"
},
"windowsImageSKU": {
"type": "string",
"metadata": {
"description": "The SKU Name of Windows Image"
},
"defaultValue": "2012-R2-Datacenter"
},
"windowsImageVersion": {
"type": "string",
"metadata": {
"description": "The Version of Windows Image"
},
"defaultValue": "latest"
},
"windowsImageVersion": {
"type": "string",
"metadata": {
"description": "The Version of Windows Image"
},
"defaultValue": "latest"
},
"storageAccount": {
"type": "string",
"metadata": {
"description": "The Storage Account Name"
}
},
"storageAccount": {
"type": "string",
"metadata": {
"description": "The Storage Account Name"
}
},
"storageAccountType": {
"type": "string",
"allowedValues": [
"Standard_LRS",
"Standard_GRS",
"Standard_RAGRS",
"Premium_LRS"
],
"metadata": {
"description": "The type of the Storage Account created"
}
},
"storageAccountType": {
"type": "string",
"allowedValues": [
"Standard_LRS",
"Standard_GRS",
"Standard_RAGRS",
"Premium_LRS"
],
"metadata": {
"description": "The type of the Storage Account created"
}
},
"adminUsername": {
"type": "string",
"metadata": {
"description": "The name of the Administrator of the new VMs and Domain"
}
},
"adminPassword": {
"type": "securestring",
"metadata": {
"description": "The password for the Administrator account of the new VMs and Domain"
}
},
"adminUsername": {
"type": "string",
"metadata": {
"description": "The name of the Administrator of the new VMs and Domain"
}
},
"adminPassword": {
"type": "securestring",
"metadata": {
"description": "The password for the Administrator account of the new VMs and Domain"
}
},
"vmSize": {
"type": "string",
"allowedValues": [
"Standard_D1",
"Standard_DS1",
"Standard_D2",
"Standard_DS2",
"Standard_D3",
"Standard_A1",
"Standard_A2",
"Standard_A3",
"Standard_DS3",
"Standard_D4",
"Standard_DS4",
"Standard_D11",
"Standard_DS11",
"Standard_D12",
"Standard_DS12",
"Standard_D13",
"Standard_DS13",
"Standard_D14",
"Standard_DS14"
],
"metadata": {
"description": "The size of the VM to be created"
},
"defaultValue": "Standard_A2"
},
"vmSize": {
"type": "string",
"allowedValues": [
"Standard_D1",
"Standard_DS1",
"Standard_D2",
"Standard_DS2",
"Standard_D3",
"Standard_A1",
"Standard_A2",
"Standard_A3",
"Standard_DS3",
"Standard_D4",
"Standard_DS4",
"Standard_D11",
"Standard_DS11",
"Standard_D12",
"Standard_DS12",
"Standard_D13",
"Standard_DS13",
"Standard_D14",
"Standard_DS14"
],
"metadata": {
"description": "The size of the VM to be created"
},
"defaultValue": "Standard_A2"
},
"subnetResourceId": {
"type": "string",
"metadata": {
"description": "Resource id to the subnet to which the VM will be connected"
}
},
"subnetResourceId": {
"type": "string",
"metadata": {
"description": "Resource id to the subnet to which the VM will be connected"
}
},
"dataDiskSize": {
"type": "int",
"metadata": {
"description": "Size of the data disks"
},
"defaultValue": 10
},
"currentIndex": {
"type": "int",
"metadata": {
"description": "Number of the current VM being deployed by the overall template (used for resource naming)"
}
}
"dataDiskSize": {
"type": "int",
"metadata": {
"description": "Size of the data disks"
},
"defaultValue": 10
},
"currentIndex": {
"type": "int",
"metadata": {
"description": "Number of the current VM being deployed by the overall template (used for resource naming)"
}
}
},
"variables": {
"TANicName": "TA-Nic-",
"vmContainerName": "vhds"
"TANicName": "TA-Nic-",
"vmContainerName": "vhds"
},
"resources": [
{
"type": "Microsoft.Storage/storageAccounts",
"name": "[concat(parameters('storageAccount'), parameters('currentIndex'))]",
"apiVersion": "2015-05-01-preview",
"location": "[resourceGroup().location]",
"properties": {
"accountType": "[parameters('storageAccountType')]"
}
},
{
"name": "[concat(variables('TANicName'), parameters('currentIndex'))]",
"type": "Microsoft.Network/networkInterfaces",
"location": "[resourceGroup().location]",
"apiVersion": "2015-05-01-preview",
"dependsOn": [
],
"properties": {
"ipConfigurations": [
{
"name": "ipconfig1",
"properties": {
"privateIPAllocationMethod": "Dynamic",
"subnet": {
"id": "[parameters('subnetResourceId')]"
}
}
}
]
}
},
{
"apiVersion": "2015-06-15",
"type": "Microsoft.Compute/virtualMachines",
"name": "[concat(parameters('vmNamePrefix'), parameters('currentIndex'))]",
"location": "[resourceGroup().location]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts',concat(parameters('storageAccount'), parameters('currentIndex')))]",
"[resourceId('Microsoft.Network/networkInterfaces',concat(variables('TANicName'), parameters('currentIndex')))]"
],
"properties": {
"hardwareProfile": {
"vmSize": "[parameters('vmSize')]"
},
"osProfile": {
"computerName": "[concat(parameters('vmNamePrefix'), parameters('currentIndex'))]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]"
},
"storageProfile": {
"imageReference": {
"publisher": "[parameters('windowsImagePublisher')]",
"offer": "[parameters('windowsImageOffer')]",
"sku": "[parameters('windowsImageSKU')]",
"version": "[parameters('windowsImageVersion')]"
},
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/',parameters('storageAccount'),parameters('currentIndex')),providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob,variables('vmContainerName'),'/', parameters('vmNamePrefix'), parameters('currentIndex'),'-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
},
"dataDisks": [
{
"vhd": {
"uri":"[concat(reference(concat('Microsoft.Storage/storageAccounts/',parameters('storageAccount'),parameters('currentIndex')),providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob,variables('vmContainerName'),'/', parameters('vmNamePrefix'), parameters('currentIndex'),'data-1.vhd')]"
},
"name":"[concat(parameters('vmNamePrefix'), parameters('currentIndex'),'data-1.vhd')]",
"caching" : "None",
"createOption": "Empty",
"diskSizeGB": "[parameters('dataDiskSize')]",
"lun": 0
}
]
},
"networkProfile": {
"networkInterfaces": [
{
"id": "[resourceId('Microsoft.Network/networkInterfaces',concat(variables('TANicName'), parameters('currentIndex')))]"
}
]
}
}
}
{
"type": "Microsoft.Storage/storageAccounts",
"name": "[concat(parameters('storageAccount'), parameters('currentIndex'))]",
"apiVersion": "2015-05-01-preview",
"location": "[resourceGroup().location]",
"properties": {
"accountType": "[parameters('storageAccountType')]"
}
},
{
"name": "[concat(variables('TANicName'), parameters('currentIndex'))]",
"type": "Microsoft.Network/networkInterfaces",
"location": "[resourceGroup().location]",
"apiVersion": "2015-05-01-preview",
"dependsOn": [
],
"properties": {
"ipConfigurations": [
{
"name": "ipconfig1",
"properties": {
"privateIPAllocationMethod": "Dynamic",
"subnet": {
"id": "[parameters('subnetResourceId')]"
}
}
}
]
}
},
{
"apiVersion": "2015-06-15",
"type": "Microsoft.Compute/virtualMachines",
"name": "[concat(parameters('vmNamePrefix'), parameters('currentIndex'))]",
"location": "[resourceGroup().location]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts',concat(parameters('storageAccount'), parameters('currentIndex')))]",
"[resourceId('Microsoft.Network/networkInterfaces',concat(variables('TANicName'), parameters('currentIndex')))]"
],
"properties": {
"hardwareProfile": {
"vmSize": "[parameters('vmSize')]"
},
"osProfile": {
"computerName": "[concat(parameters('vmNamePrefix'), parameters('currentIndex'))]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]"
},
"storageProfile": {
"imageReference": {
"publisher": "[parameters('windowsImagePublisher')]",
"offer": "[parameters('windowsImageOffer')]",
"sku": "[parameters('windowsImageSKU')]",
"version": "[parameters('windowsImageVersion')]"
},
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/',parameters('storageAccount'),parameters('currentIndex')),providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob,variables('vmContainerName'),'/', parameters('vmNamePrefix'), parameters('currentIndex'),'-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
},
"dataDisks": [
{
"vhd": {
"uri":"[concat(reference(concat('Microsoft.Storage/storageAccounts/',parameters('storageAccount'),parameters('currentIndex')),providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).primaryEndpoints.blob,variables('vmContainerName'),'/', parameters('vmNamePrefix'), parameters('currentIndex'),'data-1.vhd')]"
},
"name":"[concat(parameters('vmNamePrefix'), parameters('currentIndex'),'data-1.vhd')]",
"caching" : "None",
"createOption": "empty",
"diskSizeGB": "[parameters('dataDiskSize')]",
"lun": 0
}
]
},
"networkProfile": {
"networkInterfaces": [
{
"id": "[resourceId('Microsoft.Network/networkInterfaces',concat(variables('TANicName'), parameters('currentIndex')))]"
}
]
}
}
}
],
"outputs": {
}
"outputs": {
}
}