Push changes from develop to master (#155)

vikasnav · web-flow · commit 1aa26852a55d · 2016-09-21T13:33:28.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)
diff --git a/101-create-nsg/metadata.json b/101-create-nsg/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Create a Network Security Group",
   "description": "Creates a Network Security Group with a single variable (no parameters): networkSecurityGroupName",
   "summary": "This template creates a Network Security Group in the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-create-storage-account/metadata.json b/101-create-storage-account/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Create a Storage Account",
   "description": "Creates a Storage Account with three paremeters: newStorageAccountName, storageAccountType, location",
   "summary": "This template creates a Storage Account in the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-create-vnet-full/metadata.json b/101-create-vnet-full/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Create a Virtual Network (full)",
   "description": "Creates a Virtual Network with variables (no parameters)",
   "summary": "This template creates a Virtual Network (with DNS), Public IP address, Network Security Group, and a Network Interface in the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-create-vnet-nsg-only/metadata.json b/101-create-vnet-nsg-only/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Create a Virtual Network with Network Security Group (only)",
   "description": "Creates a Virtual Network with Network Security Group only with variables (no parameters)",
   "summary": "This template creates a Virtual Network with Network Security Group (with DNS) only in the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-create-vnet-only/metadata.json b/101-create-vnet-only/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Create a Virtual Network (only)",
   "description": "Creates a Virtual Network only with variables (no parameters)",
   "summary": "This template creates a Virtual Network (with DNS) only in the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-linux-customscript-ext/metadata.json b/101-linux-customscript-ext/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Modify an existing Linux VM with a custom script",
   "description": "Deploys the Linux Custom Script extension on an existing Linux VM",
   "summary": "This template deploys the Linux Custom Script extension to an existing VM in the Azure Stack POC environment.",
-  "githubUsername": "MatthewMcGlynn",
-  "dateUpdated": "2015-12-17"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-linux-docker-extension/metadata.json b/101-linux-docker-extension/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Docker extension for existing Linux VM",
   "description": "Deploys the Docker extension to an existing Linux VM",
   "summary": "This template deploys the Docker extension to an existing VM in the Azure Stack POC environment.",
-  "githubUsername": "MatthewMcGlynn",
-  "dateUpdated": "2015-12-17"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-linux-vmaccess-ext/metadata.json b/101-linux-vmaccess-ext/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "VMAccess for existing Linux VM",
   "description": "Deploys the VM Access extension to modify an existing Linux VM",
   "summary": "This template deploys the Linux VMAccess extension to an existing VM in the Azure Stack POC environment, allowing for the modification of users and passwords.",
-  "githubUsername": "MatthewMcGlynn",
-  "dateUpdated": "2015-12-17"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-simple-linux-vm/metadata.json b/101-simple-linux-vm/metadata.json
@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a simple Linux VM to Azure Stack",
+  "description": "Deploys a simple Linux VM. This template also deploys a Virtual Network, Public IP address, Network Security Group, and a Network Interface.",
+  "summary": "This template has default values for all the parameters and deploys a Ubuntu 14.04 LTS VM. For other supported Linux distros please use variations in azuredeploy.parameters.json.",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
+}
diff --git a/101-simple-windows-vm-diag/metadata.json b/101-simple-windows-vm-diag/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Simple Windows VM with Diagnostic Settings",
   "description": "Deploys a simple Windows VM with Diagnostic Settings. This template also deploys a Virtual Network (with DNS), Public IP address, Network Security Group, and a Network Interface.",
   "summary": "For Azure Stack POC TP1, enabling Monitoring for Virtual Machines from the UI is disabled. In order to test this functionality, the end user needs to deploy a Virtual Machine directly from an ARM template with Diagnostic Settings enabled. Once the VM is deployed, the Monitoring Agent that is deployed in the VM will be able to send data to the Storage Account provisioned to it.",
-  "githubUsername": "shriramnat",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-simple-windows-vm/metadata.json b/101-simple-windows-vm/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Deploy a simple Windows VM to Azure Stack",
   "description": "Deploys a simple Windows VM. This template also deploys a Virtual Network (with DNS), Public IP address, Network Security Group, and a Network Interface.",
   "summary": "This template takes a minimum amount of parameters and deploys a Windows VM, with the appropriate DNS setting for the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-two-vm-extensions/metadata.json b/101-two-vm-extensions/metadata.json
@@ -1,7 +1,7 @@
 {
-  "itemDisplayName": "# Deploy Two VM Extensions to existing Windows VM (Custom Script with command and BGInfo)",
+  "itemDisplayName": "Deploy Two VM Extensions to existing Windows VM (Custom Script with command and BGInfo)",
   "description": "Deploys the Custom Script and BGInfo VM Extensions with one paremeter: vmName and hard coded command.",
   "summary": "This template deploys both the Custom Script and BGInfo VM Extensions to existing Windows VM in the Azure Stack POC environment. It takes a parameter for vmName, and allows for the execution of a command (as seen in the commandToExecute Extension setting).",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-vm-ext-win-cs-cmd/metadata.json b/101-vm-ext-win-cs-cmd/metadata.json
@@ -1,7 +1,7 @@
 {
-  "itemDisplayName": "# Deploy Custom Script VM Extension to existing Windows VM (with command)",
+  "itemDisplayName": "Deploy Custom Script VM Extension to existing Windows VM (with command)",
   "description": "Deploys the Custom Script VM Extension with one paremeter: vmName and hard coded command.",
   "summary": "This template deploys the Custom Script VM Extension to existing Windows VM in the Azure Stack POC environment. It takes a parameter for vmName, and allows for the execution of a command (as seen in the commandToExecute Extension setting).",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-vm-ext-win-cs-pscmd/metadata.json b/101-vm-ext-win-cs-pscmd/metadata.json
@@ -1,7 +1,7 @@
 {
-  "itemDisplayName": "# Deploy Custom Script VM Extension to existing Windows VM (with PowerShell command)",
+  "itemDisplayName": "Deploy Custom Script VM Extension to existing Windows VM (with PowerShell command)",
   "description": "Deploys the Custom Script VM Extension with one paremeter: vmName and hard coded PowerShell command.",
   "summary": "This template deploys the Custom Script VM Extension to existing Windows VM in the Azure Stack POC environment. It takes a parameter for vmName, and allows for the execution of a PowerShell command (as seen in the commandToExecute Extension setting).",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-vm-ext-win-cs-scriptfile/metadata.json b/101-vm-ext-win-cs-scriptfile/metadata.json
@@ -1,7 +1,7 @@
 {
-  "itemDisplayName": "# Deploy Custom Script VM Extension to existing Windows VM (with script file)",
+  "itemDisplayName": "Deploy Custom Script VM Extension to existing Windows VM (with script file)",
   "description": "Deploys the Custom Script VM Extension with three paremeters: vmName, scriptFile, and scriptName.",
   "summary": "This template deploys the Custom Script VM Extension to existing Windows VM in the Azure Stack POC environment. It takes parameters for vmName, scriptFile, and scriptName.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-vm-extension-bginfo/metadata.json b/101-vm-extension-bginfo/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Deploy BGInfo VM Extension to existing VM",
   "description": "Deploys the BGInfo VM Extension with one paremeter: vmName",
   "summary": "This template deploys the BGInfo VM Extension to existing VM in the Azure Stack POC environment.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/101-vm-from-user-image/metadata.json b/101-vm-from-user-image/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Create a Virtual Machine from a User Image",
   "description": "Deploys a simple Windows VM with user images. This template also deploys a Virtual Network (with the appropriate DNS setting for the Azure Stack POC environment), Public IP address, Network Security Group, and a Network Interface.",
   "summary": "Upload existing VHDs to a Storage Account, Deploy a VM with this custom VHDs.",
-  "githubUsername": "charlesjoy",
-  "dateUpdated": "2015-12-16"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/201-Comprehensive/metadata.json b/201-Comprehensive/metadata.json
@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a Windows VM and VM extensions to Azure Stack",
+  "description": "Deploys a simple Windows VM and VM extensions",
+  "summary": "This template has default values for all the parameters and deploys a Windows VM and its VM extensions (DSC, BGinfo, CustomScript)",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
+}
diff --git a/201-comprehensive-linux-vm/metadata.json b/201-comprehensive-linux-vm/metadata.json
@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a Linux Ubuntu VM and VM extensions to Azure Stack",
+  "description": "Deploys a Linux Ubuntu VM and VM extensions",
+  "summary": "This template has default values for all the parameters and deploys a Linux Ubuntu VM and its VM extensions (CustomScript, VMAccess, Docker, OSPatching)",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
+}
diff --git a/201-ospatching-extension-on-ubuntu/metadata.json b/201-ospatching-extension-on-ubuntu/metadata.json
@@ -0,0 +1,8 @@
+{
+  "itemDisplayName": "Deploy a Linux Ubuntu VM and OSpatching extension to Azure Stack",
+  "description": "Deploys a Linux Ubuntu VM and OSpatching extension",
+  "summary": "This template has default values for all the parameters and deploys a Linux Ubuntu VM and OSPatching extension",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
+}
+
diff --git a/bootstorm-vm-boot-time/metadata.json b/bootstorm-vm-boot-time/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "VM bootstorm workload template",
   "description": "This template creates requested number of VMs and boot them simultaneously to calculate average VM boot time",
   "summary": "This template creates VM bootstorm and reports VM boot time",
-  "githubUsername": "dipakmsft",
-  "dateUpdated": "2016-03-24"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/docker-swarm-ubuntu/metadata.json b/docker-swarm-ubuntu/metadata.json
@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy Ubuntu Docker Swarm clusters on Azure Stack",
+  "description": "Deploy Ubuntu Docker Swarm clusters",
+  "summary": "This template has default values for all the parameters and deploys Ubuntu Docker Swarm clusters",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
+}
diff --git a/iostorm-vm-iops-latency/metadata.json b/iostorm-vm-iops-latency/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "VM iostorm workload template",
   "description": "This template creates requested number of VMs, boot them and start IO workload simultaneously.",
   "summary": "This template creates VM iostorm and reports IOPS and latency values.",
-  "githubUsername": "dipakmsft",
-  "dateUpdated": "2016-07-29"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/jetstress-2013-exchange-loadtest/azuredeploy.json b/jetstress-2013-exchange-loadtest/azuredeploy.json
@@ -319,7 +319,7 @@
             },
             "StorageAccountName": "[variables('uniqueStorageAccountName')]",
             "StorageAccountKey": "[listKeys(concat('Microsoft.Storage/storageAccounts/', variables('uniqueStorageAccountName')), '2015-06-15').key1]",
-            "StorageEndpoint": "[reference(resourceId('Microsoft.Storage/storageAccounts', variables('uniqueStorageAccountName')), '2015-06-15').storage.primaryEndpoints['blob']]"
+            "StorageEndpoint": "[reference(resourceId('Microsoft.Storage/storageAccounts', variables('uniqueStorageAccountName')), '2015-06-15').primaryEndpoints['blob']]"
           }
         },
         "protectedSettings": {
diff --git a/mesos-windows-jumpbox/metadata.json b/mesos-windows-jumpbox/metadata.json
@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy Ubuntu Mesos cluster on Azure Stack",
+  "description": "Deploy Ubuntu Mesos cluster with Marathon, Chronos framework and Docker engine",
+  "summary": "This template has default values for all the parameters and deploys Ubuntu Mesos cluster with Marathon, Chronos framework and Docker engine",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
+}
diff --git a/rds-deployment-existing-ad/metadata.json b/rds-deployment-existing-ad/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "RDS deployment using existing active directory",
   "description": "This template creates a simple RDSH deployment using existing active directory in same resource group",
   "summary": "Creates RDSH deployment using existing active directory in same resource group",
-  "githubUsername": "MahendraAgrawal",
-  "dateUpdated": "2016-05-19"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }
diff --git a/sql-2014-non-ha/metadata.json b/sql-2014-non-ha/metadata.json
@@ -2,6 +2,6 @@
   "itemDisplayName": "Deploys a SQL Server 2014 Always On Availability Group using DSC",
   "description": "This template creates five new Azure VMs, with a public IP address, NAT'd RDP port, external and internal load balancer and VNet, it configures two VMs to be AD DCs for a new Forest and Domain, and creates a Windows	Cluster with the other three VMs, two VMs in the cluster are running SQL Server 2014 and are configured with an availability group and an availability group listener, the other VM is a File Share Witness for the cluster  ",
   "summary": "This template creates 5 Azure VMs with Active Directory and SQL Server Always On",
-  "githubUsername": "simongdavies",
-  "dateUpdated": "2015-06-03"
+  "githubUsername": "azurestack",
+  "dateUpdated": "2016-09-20"
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "Create a Network Security Group",`
`3`	`3`	`"description": "Creates a Network Security Group with a single variable (no parameters): networkSecurityGroupName",`
`4`	`4`	`"summary": "This template creates a Network Security Group in the Azure Stack POC environment.",`
`5`		`- "githubUsername": "charlesjoy",`
`6`		`- "dateUpdated": "2015-12-16"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "Create a Storage Account",`
`3`	`3`	`"description": "Creates a Storage Account with three paremeters: newStorageAccountName, storageAccountType, location",`
`4`	`4`	`"summary": "This template creates a Storage Account in the Azure Stack POC environment.",`
`5`		`- "githubUsername": "charlesjoy",`
`6`		`- "dateUpdated": "2015-12-16"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "Create a Virtual Network (full)",`
`3`	`3`	`"description": "Creates a Virtual Network with variables (no parameters)",`
`4`	`4`	`"summary": "This template creates a Virtual Network (with DNS), Public IP address, Network Security Group, and a Network Interface in the Azure Stack POC environment.",`
`5`		`- "githubUsername": "charlesjoy",`
`6`		`- "dateUpdated": "2015-12-16"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "Modify an existing Linux VM with a custom script",`
`3`	`3`	`"description": "Deploys the Linux Custom Script extension on an existing Linux VM",`
`4`	`4`	`"summary": "This template deploys the Linux Custom Script extension to an existing VM in the Azure Stack POC environment.",`
`5`		`- "githubUsername": "MatthewMcGlynn",`
`6`		`- "dateUpdated": "2015-12-17"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "Docker extension for existing Linux VM",`
`3`	`3`	`"description": "Deploys the Docker extension to an existing Linux VM",`
`4`	`4`	`"summary": "This template deploys the Docker extension to an existing VM in the Azure Stack POC environment.",`
`5`		`- "githubUsername": "MatthewMcGlynn",`
`6`		`- "dateUpdated": "2015-12-17"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "VMAccess for existing Linux VM",`
`3`	`3`	`"description": "Deploys the VM Access extension to modify an existing Linux VM",`
`4`	`4`	`"summary": "This template deploys the Linux VMAccess extension to an existing VM in the Azure Stack POC environment, allowing for the modification of users and passwords.",`
`5`		`- "githubUsername": "MatthewMcGlynn",`
`6`		`- "dateUpdated": "2015-12-17"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"itemDisplayName": "Simple Windows VM with Diagnostic Settings",`
`3`	`3`	`"description": "Deploys a simple Windows VM with Diagnostic Settings. This template also deploys a Virtual Network (with DNS), Public IP address, Network Security Group, and a Network Interface.",`
`4`	`4`	`"summary": "For Azure Stack POC TP1, enabling Monitoring for Virtual Machines from the UI is disabled. In order to test this functionality, the end user needs to deploy a Virtual Machine directly from an ARM template with Diagnostic Settings enabled. Once the VM is deployed, the Monitoring Agent that is deployed in the VM will be able to send data to the Storage Account provisioned to it.",`
`5`		`- "githubUsername": "shriramnat",`
`6`		`- "dateUpdated": "2015-12-16"`
	`5`	`+ "githubUsername": "azurestack",`
	`6`	`+ "dateUpdated": "2016-09-20"`
`7`	`7`	`}`