Merge pull request #4663 from carmstrong/azure-premium-storage

fix(contrib/azure): use Azure premium storage

Author: carmstrong

contrib/azure/arm-template.json

@@ -65,7 +65,7 @@
     "customData": {
       "type": "string",
       "metadata": {
-        "description": "Base64-encoded cloud-config.yaml file to deploy and start Fleet"
+        "description": "Base64-encoded cloud-config.yaml file to deploy and start fleet"
       }
     },
     "numberOfNodes": {
@@ -78,23 +78,33 @@
     "dockerVolumeSize": {
       "type": "int",
       "metadata": {
-        "description": "Size in GB of the Docker volume."
+        "description": "Size in GB of the Docker volume"
       },
       "defaultValue": "100"
     },
     "coreosVersion": {
       "type": "string",
       "metadata": {
-        "description": "Version of CoreOS to deploy."
+        "description": "Version of CoreOS to deploy"
       }
+    },
+    "storageAccountType": {
+      "type": "string",
+      "metadata": {
+        "description": "Storage account type"
+      },
+      "allowedValues": [
+        "Standard_LRS",
+        "Premium_LRS"
+      ],
+      "defaultValue": "Premium_LRS"
     }
   },
   "variables": {
     "addressPrefix": "10.0.0.0/16",
     "subnet1Name": "Subnet-1",
     "subnet1Prefix": "10.0.0.0/24",
     "publicIPAddressType": "Dynamic",
-    "storageAccountType": "Standard_LRS",
     "imagePublisher": "CoreOS",
     "imageOffer": "CoreOS",
     "imageSKU": "Stable",
@@ -134,7 +144,7 @@
       "location": "[resourceGroup().location]",
       "apiVersion": "2015-05-01-preview",
       "properties": {
-        "accountType": "[variables('storageAccountType')]"
+        "accountType": "[parameters('storageAccountType')]"
       }
     },
     {

contrib/azure/parameters.json

@@ -9,7 +9,7 @@
     "value": ""
   },
   "vmSize": {
-    "value": "Standard_A3"
+    "value": "Standard_DS2"
   },
   "adminUsername": {
     "value": "core"
@@ -28,5 +28,8 @@
   },
   "coreosVersion": {
     "value": "766.4.0"
+  },
+  "storageAccountType": {
+    "value": "Premium_LRS"
   }
 }

docs/installing_deis/azure.rst

@@ -70,10 +70,20 @@ base64-encoded version of ``azure-user-data``. This can be generated using ``bas
 
     $ base64 azure-user-data
 
-Paste the result into ``parameters.json``.
+Paste the result into ``parameters.json``. Any of the values in ``parameters.json``
+are defaults and can be customized if desired.
+
+.. note::
+
+  For best performance, Deis clusters on Azure default to using `premium storage`_.
+  This incurs an additional cost. Using standard storage is possible, but is unsupported
+  as it resulted in cluster issues during testing. Premium storage is only available
+  in `some regions`_.
 
 Finally, we can deploy. Choose a valid location to deploy -- you can list all locations
-with ``azure location list``:
+with ``azure location list``.
+
+As an example, to create a deployment named "deis" in the "West US" region:
 
 .. code-block:: console
 
@@ -103,3 +113,5 @@ start installing the platform.
 .. _`Azure Resource Manager`: https://azure.microsoft.com/en-us/documentation/articles/resource-manager-deployment-model/
 .. _`contrib/azure`: https://github.com/deis/deis/tree/master/contrib/azure
 .. _`organizational account`: http://www.brucebnews.com/2013/04/the-difference-between-a-microsoft-account-and-an-office-365-account/
+.. _`premium storage`: https://azure.microsoft.com/en-us/services/storage/premium-storage/
+.. _`some regions`: https://azure.microsoft.com/en-us/regions/#services