Push changes from develop to master (#164)

vikasnav · web-flow · commit 891997c2fadf · 2016-09-27T12:05:37.000-07:00
* Fixed jetstress Storage Endpoint api usage (#152) * Metadata.json fix for all the existing ones and newly created for Linux templates (#154) * Docker swarm compute resource apiversion fix (#157) * SharePoint 2013 and VS2013 template readme updates (#160) Updated readme files for the SharePoint 2013 and Visual Studio 2013 templates * More fixes based on VS code tool (#163)
diff --git a/docker-swarm-ubuntu/azuredeploy-sshkeys.parameters.json b/docker-swarm-ubuntu/azuredeploy-sshkeys.parameters.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentparameters.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": 
     {
diff --git a/docker-swarm-ubuntu/azuredeploy.json b/docker-swarm-ubuntu/azuredeploy.json
@@ -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')]"
diff --git a/docker-swarm-ubuntu/azuredeploy.parameters.json b/docker-swarm-ubuntu/azuredeploy.parameters.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentparameters.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": 
     {
diff --git a/mesos-windows-jumpbox/azuredeploy-sshkeys.parameters.json b/mesos-windows-jumpbox/azuredeploy-sshkeys.parameters.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentparameters.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
         "sshRSAPublicKey": {
diff --git a/mesos-windows-jumpbox/azuredeploy.json b/mesos-windows-jumpbox/azuredeploy.json
@@ -377,7 +377,7 @@
                     "vmSize": "[variables('jumpboxVMSize')]"
                 },
                 "osProfile": {
-                    "computername": "[variables('jumpboxVMName')]",
+                    "computerName": "[variables('jumpboxVMName')]",
                     "adminUsername": "[variables('windowsAdminUsername')]",
                     "adminPassword": "[variables('windowsAdminPassword')]"
                 },
diff --git a/mesos-windows-jumpbox/azuredeploy.parameters.json b/mesos-windows-jumpbox/azuredeploy.parameters.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentparameters.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
         "agentCount": {
diff --git a/rds-deployment-existing-ad/azuredeploy.json b/rds-deployment-existing-ad/azuredeploy.json
@@ -66,8 +66,6 @@
         "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",
@@ -344,7 +342,7 @@
       "resources": [
         {
           "apiVersion": "2015-06-15",
-          "type": "Microsoft.Compute/virtualMachines/extensions",
+          "type": "extensions",
           "name": "gw-vm/gateway",
           "location": "[resourceGroup().location]",
           "dependsOn": [
@@ -429,7 +427,7 @@
       "resources": [
         {
           "apiVersion": "2015-06-15",
-          "type": "Microsoft.Compute/virtualMachines/extensions",
+          "type": "extensions",
           "name": "[concat('rdsh-', copyindex(),'/sessionhost')]",
           "location": "[resourceGroup().location]",
           "dependsOn": [
diff --git a/sharepoint-2013-non-ha/Readme.md b/sharepoint-2013-non-ha/Readme.md
@@ -13,20 +13,57 @@ One external load balancer creates an RDP NAT rule to allow connectivity to the
 The second external load balancer creates an RDP NAT rule to allow connectivity to the SharePoint VM
 To access the SQL VM use the domain controller or the SharePoint VMs as jumpboxes
 
+## Prerequisites
++	This template requires a SharePoint 2013 with SP1 iso for installing the SharePoint server. If the provided iso does not include SP1 setup will fail.
+	The iso for SharePoint 2013 with SP1 iso is available for download from the internet on MSDN subscriber downloads, Microsoft Partner Network, or Volume Licensing Service Center.
+	If you don't wish to download the iso from the internet at template deployment time, you can download the iso beforehand place it on a local location where it 
+	is reachable for the VMs to download, for example Azure Stack blob storage. You can run the following script on your Azure Stack environment:
+	
+	# Variables
+	$rgname = "isosrg"
+	$saname = "isossa"
+	$containername = "isos"
+	$location = "local"
+	$isoPath = <ISO Path> # File path to the iso to upload, for example C:\isos\myiso.iso
+	
+	# Add specific Azure Stack Environment 
+	$AadTenantId = <Tenant Id> #GUID Specific to the AAD Tenant 
+
+	Add-AzureRmEnvironment -Name 'Azure Stack' `
+��� -ActiveDirectoryEndpoint ("https://login.windows.net/$AadTenantId/") `
+��� -ActiveDirectoryServiceEndpointResourceId "https://azurestack.local-api/" `
+��� -ResourceManagerEndpoint ("https://api.azurestack.local/") `
+��� -GalleryEndpoint ("https://gallery.azurestack.local/") `
+��� -GraphEndpoint "https://graph.windows.net/"
+
+	# Get Azure Stack Environment Information 
+	$env = Get-AzureRmEnvironment 'Azure Stack' 
+
+	# Authenticate to AAD with Azure Stack Environment 
+	Add-AzureRmAccount -Environment $env -Verbose 
+	
+	# Create a resource group, storage account, and storage container
+	New-AzureRmResourceGroup -Name $rgname -Location $location
+	New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $saname -Type Standard_LRS -Location $location
+	Set-AzureRmCurrentStorageAccount -ResourceGroupName $rgname -StorageAccountName $saname
+	$container = New-AzureStorageContainer -Name $containername -Permission Container
+	# Upload the blob
+	$file = Get-ChildItem -Path $isoPath
+	Set-AzureStorageBlobContent -Container $containername -File $file.FullName -Blob $file.Name
+	$isodownloaduri = (Get-AzureStorageBlob -Blob $file.Name -Container $containername).ICloudBlob.uri.AbsoluteUri
+	# This is the value you will use for the sharepoint2013SP1DownloadLink parameter on the SharePoint 2013 template
+	$isodownloaduri
+	
++	This template requires a product key for SharePoint 2013. A trial key for SharePoint 2013 can be found on MSDN subscriber downloads or from the TechNet
+	evaluation center.
+
 ## Parameters
 +	domainName: FQDN of the new domain to be created.
 +	sqlServerServiceAccountUserName: Username of the SQL server service account to create.
 +	adminUsername: Username of the local Administrator account of the new VMs and domain.
 +	adminPassword: Password of the local Administrator account of the new VMs and domain.
 +	sharepoint2013SP1DownloadLink: Direct download link for the SharePoint 2013 with SP1 ISO.
 +	sharepoint2013ProductKey: Product key for SharePoint 2013 with SP1, required for SharePoint setup.
-
-## Notes
-+	This template requires a SharePoint 2013 with SP1 iso for installing the SharePoint server. If the provided iso does not include SP1 setup will fail.
-	A direct link for SharePoint 2013 with SP1 iso can be obtained from MSDN subscriber downloads. Note however that MSDN subscribe downloads links expire
-	after a period of time. If you have an iso available, place it on a location where it is reachable for the VMs to download (Azure blob storage for example)
-+	This template requires a product key for SharePoint 2013. A trial key for SharePoint 2013 can be found on MSDN subscriber downloads or from the TechNet
-	evaluation center.
 	
 <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAzureStack-QuickStart-Templates%2Fdevelop%2Fsharepoint-2013-non-ha%2Fazuredeploy.json" target="_blank">
     <img src="http://azuredeploy.net/deploybutton.png"/>
diff --git a/sharepoint-2013-non-ha/spVMTemplate.json b/sharepoint-2013-non-ha/spVMTemplate.json
@@ -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
                         }
diff --git a/sharepoint-2013-sample-loadtest/DownloadLoadTestPackage.ps1 b/sharepoint-2013-sample-loadtest/DownloadLoadTestPackage.ps1
diff --git a/sql-2014-non-ha/sqlVmTemplate.json b/sql-2014-non-ha/sqlVmTemplate.json
@@ -87,17 +87,6 @@
         }
     },
     "variables": {
-        "apiVersion": {
-            "storage": {
-                "storageAccounts": "2015-06-15"
-            },
-            "compute": {
-                "virtualMachines": "2015-06-15"
-            },
-            "network": {
-                "virtualNetworks": "2015-05-01-preview"
-            }
-        },
         "location": "[resourceGroup().location]",
         "vmContainerName": "vhds"
 
@@ -107,7 +96,7 @@
             "name": "[parameters('storageAccount')]",
             "type": "Microsoft.Storage/storageAccounts",
             "location": "[variables('location')]",
-            "apiVersion": "[variables('apiVersion').storage.storageAccounts]",
+            "apiVersion": "2015-06-15",
             "properties": {
                 "accountType": "[parameters('storageAccountType')]"
             }
@@ -116,7 +105,7 @@
             "name": "[parameters('sqlNicName')]",
             "type": "Microsoft.Network/networkInterfaces",
             "location": "[variables('location')]",
-            "apiVersion": "[variables('apiVersion').network.virtualNetworks]",
+            "apiVersion": "2015-05-01-preview",
             "properties": {
                 "ipConfigurations": [
                     {
@@ -135,7 +124,7 @@
             "name": "[parameters('vmName')]",
             "type": "Microsoft.Compute/virtualMachines",
             "location": "[variables('location')]",
-            "apiVersion": "[variables('apiVersion').compute.virtualMachines]",
+            "apiVersion": "2015-06-15",
             "dependsOn": [
                 "[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccount'))]",
                 "[resourceId('Microsoft.Network/networkInterfaces',parameters('sqlNicName'))]"
@@ -171,7 +160,7 @@
                             },
                             "name": "[concat(parameters('vmName'), '0','data-1.vhd')]",
                             "caching": "None",
-                            "createOption": "empty",
+                            "createOption": "Empty",
                             "diskSizeGB": "[parameters('sqlDiskSize')]",
                             "lun": 0
                         },
@@ -181,7 +170,7 @@
                             },
                             "name": "[concat(parameters('vmName'), '0','log-1.vhd')]",
                             "caching": "None",
-                            "createOption": "empty",
+                            "createOption": "Empty",
                             "diskSizeGB": "[parameters('sqlDiskSize')]",
                             "lun": 1
                         }
diff --git a/vs2013-tcta/Readme.md b/vs2013-tcta/Readme.md
@@ -9,68 +9,78 @@ This template will create a Visual Studio 2013 test controller/test agent farm u
 The external load balancer creates an RDP NAT rule to allow connectivity to the console VM.
 The components are connected to an existing virtual network to allow connectivity to the target endpoints for load testing.
 
-## Notes
+## Prerequisites
++	An existing Virtual network connected to a domain controller (this is usually the network of the environment to be tested)
++	Visual Studio 2013 Ultimate product key: required for installation of Visual Studio on the test console machine
+
+## Parameters
++	domainName: Name of the existing domain to which the new VMs will join
++	targetResourceGroupName: Name of the resource group that contains the virtual network to which the new VMs will connect to
++	targetVMNetworkName: Name of the existing VM network to connect to
++	targetVMNetworkSubnetName: Name of the exsisting subnet to connect to
++	adminUsername: The name of the Administrator of the new VMs and Domain
++	adminPassword: The password for the Administrator account of the new VMs and Domain
++	serviceAccountUserName: The name of the user account under which the test controller and test agent services will run
++	serviceAccountPassword: The password of the user account under which the test controller and test agent services will run
++	testAgentCount: Number of test agent VMs to create
++	VisualStudioProductKey: Product key (25 characters no spaces) for Visual Studio activation
 
+## Notes
 + 	The image used to create this deployment is
 	+ 	Latest Windows Server 2012 R2 Image with .Net 3.5
 +	The installer bits for SQL 2014 and Visual Studio 2013 Ultimate with Update 5 are downloaded at deployment time but can be pre-loaded into the image.
 	SQL 2014 trial can be downloaded here: https://www.microsoft.com/en-us/evalcenter/evaluate-sql-server-2014. 
 	After downloading the ISO, extract the files to a folder called SQL2014 on the image
-+ 	The image configuration is defined in variables - details below - but the scripts that configure this deployment have only been tested with these versions and may not work on other images.
-+	Required workaround for Azure Stack TP:
-	+	Add a DNS forwarder to address 192.168.100.2 on the DNS server for the network to which the TC/TA farm will be connected to before deploying this template.
-		This can be done via PowerShell by running the following commandlet on the DNS machine: Add-DnsServerForwarder -IPAddress "192.168.100.2"
-
-## Deploying from Portal
-
-+	Login into Azurestack portal
-+	Click "New" -> "Custom" -> "Template deployment"
-+	Copy conent in azuredeploy.json, Click "Edit Tempalte" and paste content, then Click "Save"
-+	Fill the parameters
-+	Click "Create new" to create new Resource Group
-+	Click "Create"
-
-## Deploying from PowerShell
-
-Download azuredeploy.json and azuredeploy.azurestack.parameters.json to local machine 
-
-Modify parameter value in azuredeploy.azurestack.parameters.json as needed 
-
-Allow cookies in IE: Open IE at c:\Program Files\Internet Explorer\iexplore.exe -> Internet Options -> Privacy -> Advanced -> Click OK -> Click OK again
-
-Launch a PowerShell console
-
-Change working folder to the folder containing this template
-
-```PowerShell
-
-# Add specific Azure Stack Environment 
-
-$AadTenantId = <Tenant Id> #GUID Specific to the AAD Tenant 
-
-Add-AzureRmEnvironment -Name 'Azure Stack' `
-��� -ActiveDirectoryEndpoint ("https://login.windows.net/$AadTenantId/") `
-��� -ActiveDirectoryServiceEndpointResourceId "https://azurestack.local-api/" `
-��� -ResourceManagerEndpoint ("https://api.azurestack.local/") `
-��� -GalleryEndpoint ("https://gallery.azurestack.local/") `
-��� -GraphEndpoint "https://graph.windows.net/"
-
-# Get Azure Stack Environment Information 
-$env = Get-AzureRmEnvironment 'Azure Stack' 
-
-# Authenticate to AAD with Azure Stack Environment 
-Add-AzureRmAccount -Environment $env -Verbose 
-
-# Get Azure Stack Environment Subscription 
-$SubName = <Subscription Name> # The subscription name is the offer name by default 
-Get-AzureRmSubscription -SubscriptionName $SubName | Select-AzureRmSubscription
-
-#Resource group name. Please make sure the resource group does not exist (optional, this template can be deployed to an existing resource group)
-$resourceGroupName = "sqlResourceGroup"
-$deploymentName = "SqlDeployment"
-$location = "Local" 
-New-AzurermResourceGroup -Name $resourceGroupName -Location $location 
 
-#Start new Deployment
-New-AzurermResourceGroupDeployment -Name $deploymentName -ResourceGroupName $resourceGroupName `
-��� -TemplateParameterFile .\azuredeploy.azurestack.parameters.json -TemplateFile .\azuredeploy.json
+## Deployment steps
+1. Deploy to azure stack portal using custom deployment.
+2. Deploy through Visual Studio using azuredeploy.json and azuredeploy.parameters.json
+2. Deploy the solution from PowerShell with the following PowerShell script 
+
+``` PowerShell
+## Specify your AzureAD Tenant in a variable. 
+# If you know the prefix of your <prefix>.onmicrosoft.com AzureAD account use option 1)
+# If you do not know the prefix of your <prefix>.onmicrosoft.com AzureAD account use option 2)
+
+# Option 1) If you know the prefix of your <prefix>.onmicrosoft.com AzureAD namespace.
+# You need to set that in the $AadTenantId varibale (e.g. contoso.onmicrosoft.com).
+    $AadTenantId = "contoso"
+
+# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets. 
+# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
+    $AadTenant = Login-AzureRmAccount
+    $AadTenantId = $AadTenant.Context.Tenant.TenantId
+
+## Configure the environment with the Add-AzureRmEnvironment cmdlt
+    Add-AzureRmEnvironment -Name 'Azure Stack' `
+        -ActiveDirectoryEndpoint ("https://login.windows.net/$AadTenantId/") `
+        -ActiveDirectoryServiceEndpointResourceId "https://azurestack.local-api/"`
+        -ResourceManagerEndpoint ("https://api.azurestack.local/") `
+        -GalleryEndpoint ("https://gallery.azurestack.local/") `
+        -GraphEndpoint "https://graph.windows.net/"
+
+## Authenticate a user to the environment (you will be prompted during authentication)
+    $privateEnv = Get-AzureRmEnvironment 'Azure Stack'
+    $privateAzure = Add-AzureRmAccount -Environment $privateEnv -Verbose
+    Select-AzureRmProfile -Profile $privateAzure
+
+## Select an existing subscription where the deployment will take place
+    Get-AzureRmSubscription -SubscriptionName "SUBSCRIPTION_NAME"  | Select-AzureRmSubscription
+
+# Set Deployment Variables
+$myNum = "001" #Modify this per deployment
+$RGName = "myRG$myNum"
+$myLocation = "local"
+
+$templateFile= "azuredeploy.json"
+$templateParameterFile= "azuredeploy.parameters.json"
+
+# Create Resource Group for Template Deployment
+New-AzureRmResourceGroup -Name $RGName -Location $myLocation
+
+# Deploy Template 
+New-AzureRmResourceGroupDeployment `
+    -ResourceGroupName $RGName `
+    -TemplateFile $templateFile `
+	-TemplateParameterFile $templateParameterFile
+```
diff --git a/vs2013-tcta/consoleVMTemplate.json b/vs2013-tcta/consoleVMTemplate.json
@@ -220,7 +220,7 @@
 							},
 							"name": "[concat(parameters('vmNamePrefix'), '0','data-1.vhd')]",
 							"caching": "None",
-							"createOption": "empty",
+							"createOption": "Empty",
 							"diskSizeGB": "[parameters('dataDiskSize')]",
 							"lun": 0
 						},
@@ -230,7 +230,7 @@
 							},
 							"name": "[concat(parameters('vmNamePrefix'), '0','log-1.vhd')]",
 							"caching": "None",
-							"createOption": "empty",
+							"createOption": "Empty",
 							"diskSizeGB": "[parameters('dataDiskSize')]",
 							"lun": 1
 						}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentparameters.json#",`
	`2`	`+ "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",`
`3`	`3`	`"contentVersion": "1.0.0.0",`
`4`	`4`	`"parameters":`
`5`	`5`	`{`