Merge all the changes from Vikasnav-patch-1. The changes contain removal of Public IP addresses, removal of unwanted parameters and fix bugs
This commit is contained in:
JesusAlvarezTorres 2016-11-02 12:58:59 -07:00 коммит произвёл vikasnav
Родитель 8602edab19
Коммит 85313ee423
37 изменённых файлов: 213 добавлений и 283 удалений

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

@ -30,4 +30,6 @@
}
],
"outputs": {}
}
}

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

@ -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": {
},

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

@ -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": {
},

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

@ -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": {

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

@ -4,9 +4,6 @@
"parameters": {
"username": {
"value": "Test"
},
"password": {
"value": "GEN-PASSWORD"
}
}
}

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

@ -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)]"
}
}
}
]
}
]
}

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

@ -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')]"
}

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

@ -5,12 +5,6 @@
"vmsuffix": {
"value": "myVM"
},
"adminPassword": {
"value": "GEN-PASSWORD"
},
"storageAccountNamePrefix": {
"value": "DiagStor"
},
"windowsOSVersion": {
"value": "2012-R2-Datacenter"
},

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

@ -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')]"
}

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

@ -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": [
]

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

@ -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"
}
}
}
}

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

@ -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"
}

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

@ -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"
}
}
}
}

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

@ -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": {

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

@ -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"
}
}
}
}

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

@ -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",

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

@ -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"
},

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

@ -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": {

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

@ -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"
}
}
}

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

@ -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')]"
}

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

@ -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": { }
}
}

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

@ -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": {
}

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

@ -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",

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

@ -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",

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

@ -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": ""
},

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

@ -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')]",

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

@ -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'))]",

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

@ -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",

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

@ -4,9 +4,6 @@
"parameters": {
"adminUsername": {
"value": "Administrator"
},
"adminPassword": {
"value": "GEN-PASSWORD"
}
}
}

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

@ -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')]",

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

@ -12,7 +12,10 @@
"value": "AZURE-AD-ACCOUNT-TENANT-ID"
},
"vmCount": {
"value": 5
"value": 2
},
"vmSize": {
"value": "Standard_A1"
}
}
}

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

@ -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')]",

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

@ -3,7 +3,10 @@
"contentVersion": "1.16.07.29",
"parameters": {
"vmCount": {
"value": 5
"value": 2
},
"vmSize": {
"value": "Standard_A1"
}
}
}
}

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

@ -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"
}

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

@ -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",

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

@ -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')]" }
}
}
},

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

@ -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": ""
}
}