Resubmit:Add metadata to existing managed disk templates. (#408)

* Resolve conflict for file 201-vm-windows-comprehensive-with-managed-disks/README.md

* Resubmit:Add metadata to existing managed disk templates.

* Resubmit:Add metadata to existing managed disk templates.

101Linux-Empty-AttachDataDisk-managed/README.md

@@ -0,0 +1,2 @@
+# Deploy a Linux VM and attach a data disk - uses managed disks
+This template deploys a linux VM and attach a data disk. The VM is set with 2 managed disks; the OS disk and a data disk of 10 GB.

101Linux-Empty-AttachDataDisk-managed/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

101Linux-Empty-AttachDataDisk-managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a Linux VM and attach a data disk - uses managed disks",
+  "description": "This template deploys a linux VM and attach a data disk. The VM is set with 2 managed disks; the OS disk and a data disk of 10 GB",
+  "summary": "Deploy a Linux VM and attach a data disk - uses managed disks",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

101Linux-EmptyDataDisk-managed/README.md

@@ -0,0 +1,2 @@
+# Deploy a Linux VM with an empty data disk - uses managed disks
+This template deploys a linux VM with an empty data disk. The VM is set with 2 managed disks; the OS disk and a data disk of 10 GB.

101Linux-EmptyDataDisk-managed/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

101Linux-EmptyDataDisk-managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a Linux VM with an empty data disk - uses managed disks",
+  "description": "This template deploys a linux VM with an empty data disk. The VM is set with 2 managed disks; the OS disk and a data disk of 10 GB",
+  "summary": "Deploy a Linux VM with an empty data disk - uses managed disks",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

101Windows-Empty-AttachDataDisk-managed/README.md

@@ -0,0 +1,2 @@
+# Deploy a Windows VM with an empty data disk and attach another data disk - uses managed disks
+This template deploys a Windows VM with an empty data disk and attach another data disk. The VM is set with 3 managed disks; the OS disk and two data disk of 10 GB each.

101Windows-Empty-AttachDataDisk-managed/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

101Windows-Empty-AttachDataDisk-managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a Windows VM with an empty data disk and attach another data disk - uses managed disks",
+  "description": "This template deploys a Windows VM with an empty data disk and attach another data disk. The VM is set with 3 managed disks; the OS disk and two data disk of 10 GB each",
+  "summary": "Deploy a Windows VM with an empty data disk and attach another data disk - uses managed disks",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

201-vm-windows-comprehensive-with-managed-disks/README.md

@@ -1,4 +1,4 @@
-# [IaaS Windows VM Comprehensive Resources]
+# Deploy a Windows VM with customscript, BGInfo and DSC extensions - uses managed disks
 
 This template deploys a Windows VM and also uses customscript, BGInfo and DSC extensions. The VM is set with 2 managed disks; the OS disk and a data disk of 1 GB.
 

201-vm-windows-comprehensive-with-managed-disks/azuredeploy.json

@@ -16,6 +16,18 @@
         "description": "The password for the Administrator account of the new VMs. Default value is subscription id"
       },
       "defaultValue": "[concat('Subscription#',subscription().subscriptionId)]"
+    },
+    "windowsImageSKU": {
+      "type": "string",
+      "defaultValue": "2016-Datacenter",
+      "allowedValues": [
+        "2012-R2-Datacenter",
+        "2016-Datacenter-Server-Core",
+        "2016-Datacenter"
+      ],
+      "metadata": {
+        "description": "The Windows version for the VM. This will pick a fully patched image of this given Windows version. Allowed values: 2008-R2-SP1, 2012-Datacenter, 2012-R2-Datacenter, 2016-Datacenter."
+      }
     }
   },
   "variables": {
@@ -27,7 +39,6 @@
     "virtualNetworkAddressRange": "10.0.0.0/16",
     "windowsImagePublisher": "MicrosoftWindowsServer",
     "windowsImageOffer": "WindowsServer",
-    "windowsImageSKU": "2012-R2-Datacenter",
     "windowsImageVersion": "latest",
     "dataDiskSize": 2,
     "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/201-vm-windows-comprehensive-with-managed-disks",
@@ -228,7 +239,7 @@
           "imageReference": {
             "publisher": "[variables('windowsImagePublisher')]",
             "offer": "[variables('windowsImageOffer')]",
-            "sku": "[variables('windowsImageSKU')]",
+            "sku": "[parameters('windowsImageSKU')]",
             "version": "[variables('windowsImageVersion')]"
           },
           "osDisk": {

201-vm-windows-comprehensive/azuredeploy.json

@@ -16,6 +16,18 @@
         "description": "The password for the Administrator account of the new VMs. Default value is subscription id"
       },
       "defaultValue": "[concat('Subscription#',subscription().subscriptionId)]"
+    },
+    "windowsImageSKU": {
+      "type": "string",
+      "defaultValue": "2016-Datacenter",
+      "allowedValues": [
+        "2012-R2-Datacenter",
+        "2016-Datacenter-Server-Core",
+        "2016-Datacenter"
+      ],
+      "metadata": {
+        "description": "The Windows version for the VM. This will pick a fully patched image of this given Windows version. Allowed values: 2008-R2-SP1, 2012-Datacenter, 2012-R2-Datacenter, 2016-Datacenter."
+      }
     }
   },
   "variables": {
@@ -27,7 +39,6 @@
     "virtualNetworkAddressRange": "10.0.0.0/16",
     "windowsImagePublisher": "MicrosoftWindowsServer",
     "windowsImageOffer": "WindowsServer",
-    "windowsImageSKU": "2012-R2-Datacenter",
     "windowsImageVersion": "latest",
     "dataDiskSize": 2,
     "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/201-vm-windows-comprehensive",
@@ -228,7 +239,7 @@
           "imageReference": {
             "publisher": "[variables('windowsImagePublisher')]",
             "offer": "[variables('windowsImageOffer')]",
-            "sku": "[variables('windowsImageSKU')]",
+            "sku": "[parameters('windowsImageSKU')]",
             "version": "[variables('windowsImageVersion')]"
           },
           "osDisk": {

ApplyCustomScriptExtensionToWindowsVm+managed/README.md

@@ -0,0 +1,2 @@
+# Deploy a custom script extenstion to an existing Windows VM
+This template deploys a custom script extenstion to an existing Windows VM. The VM name needs to be passed in as input

ApplyCustomScriptExtensionToWindowsVm+managed/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

ApplyCustomScriptExtensionToWindowsVm+managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a custom script extenstion to an existing Windows VM",
+  "description": "his template deploys a custom script extenstion to an existing Windows VM. The VM name needs to be passed in as input",
+  "summary": "Deploy a custom script extenstion to an existing Windows VM",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

Linux-VmssManaged/README.md

@@ -0,0 +1,7 @@
+# Deploy a VM Scale Set of Linux VMs - managed disks
+This template allows you to deploy a VM Scale Set of Linux VMs. To connect from the load balancer to a VM in the scale set, you would go to the AzureStack Portal, find the load balancer of your scale set, examine the NAT rules, then connect using the NAT rule you want. For example, if there is a NAT rule on port 50000, you could RDP on port 50000 of the public IP to connect to that VM. Similarly if something is listening on port 80 we can connect to it using port 80. The VMs use managed disks.
+
+PARAMETER RESTRICTIONS
+======================
+vmssName must be 3-10 characters in length. It should also be globally unique across all of AzureStack. If it isn't globally unique, it is possible that this template will still deploy properly, but we don't recommend relying on this pseudo-probabilistic behavior.
+InstanceCount must be 20 or less. VM Scale Set supports upto 100 VMs and one should add more storage accounts to support this number.

Linux-VmssManaged/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

Linux-VmssManaged/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Deploy a Linux VM Scale Set",
+  "description": "This template allows you to deploy a VM Scale Set of Linux VMs. These VMs are behind a load balancer with NAT rules for rdp connections. This template uses managed disks.",
+  "summary": "This template deploys a Linux VM Scale Set with custom script extension behind a load balancer with NAT rules for rdp connections.",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

MultiVm-Linux-AvailabilitySet-managed/README.md

@@ -0,0 +1,2 @@
+# Multiple Linux VM Availability Set - managed disks
+This template deploys a set of Linux VMs as part of the same availability set. This template template also deploys an availability set, a virtual Network (with DNS), a load balancer with a front end Public IP address, and a Network Security Group. The disks are managed disks.

MultiVm-Linux-AvailabilitySet-managed/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

MultiVm-Linux-AvailabilitySet-managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Multiple Linux VM Availability Set - managed disks",
+  "description": "This template deploys a set of Linux VMs as part of the same availability set. This template template also deploys an availability set, a virtual Network (with DNS), a load balancer with a front end Public IP address, and a Network Security Group. The disks are managed disks",
+  "summary": "This template deploys a set of Linux VMs as part of the same availability set.",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

MultiVm-Windows-AvailabilitySet-managed/README.md

@@ -0,0 +1,2 @@
+# Multiple Windows VM Availability Set - managed disks
+This template deploys a set of Windows VMs as part of the same availability set. This template template also deploys an availability set, a virtual Network (with DNS), a load balancer with a front end Public IP address, and a Network Security Group. The disks are managed disks.

MultiVm-Windows-AvailabilitySet-managed/azuredeploy.parameters.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {	
+    }
+}

MultiVm-Windows-AvailabilitySet-managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Multiple Windows VMs Availability Set - managed disks",
+  "description": "This template deploys a set of Windows VMs as part of the same availability set. This template template also deploys an availability set, a virtual Network (with DNS), a load balancer with a front end Public IP address, and a Network Security Group. The disks are managed disks",
+  "summary": "This template deploys a set of Windows VMs as part of the same availability set.",
+  "githubUsername": "azurestack",
+  "dateUpdated": "2018-11-06"
+}

ScaleInOutExistingVmss-managed/README.md

@@ -0,0 +1,12 @@
+# Manually change the number of VMs in an existing VM Scale Set
+
+This template allows you to manually scale in or out the number of VMs in an existing Scale Set. The capacity specified will be the new capacity of the scale set. 
+
+The VM size in this template is set to Standard_D1. If you are doing a scale operation on a VM Scale Set with different sized VMs, you will need to change this parameter. I.e. make sure the "sku" property in this template matches the "sku" you originally deployed your Scale Set with. Otherwise, either this deployment will fail (when the VM size belongs to a different family), or VMs will be created with a different size to the existing VMs.
+
+PARAMETER RESTRICTIONS
+======================
+
+existingVMSSName must be the name of an EXISTING VM Scale Set
+
+vmSku must be the same size as the VM size of your EXISTING VM Scale Set

ScaleInOutExistingVmss-managed/azuredeploy.parameters.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "existingVmssName": {
+      "value": "MyExistingVmss"
+    },
+    "newCapacity": {
+      "value": 3
+    }
+  }
+}

ScaleInOutExistingVmss-managed/metadata.json

@@ -0,0 +1,7 @@
+{
+  "itemDisplayName": "Manually change the number of VMs in a Scale Set.",
+  "description": "This template allows you to manually change the number of VMs in a Scale Set.",
+  "summary": "This template allows you to manually change the number of VMs in a Scale Set.",
+  "githubUsername": "gatneil",
+  "dateUpdated": "2018-11-06"
+}