New defaults

Makefile

@@ -1,5 +1,5 @@
 # Set environment variables
-export RESOURCE_GROUP?=swarm-cluster
+export RESOURCE_GROUP?=ci-swarm-cluster
 export LOCATION?=eastus
 export MASTER_COUNT?=1
 export AGENT_COUNT?=3

README.md

@@ -4,10 +4,12 @@ A dynamically resizable Docker Swarm cluster for Azure. Watch the [Channel 9 vid
 
 ## What
 
-This is a barebones Azure Resource Manager template that automatically deploys a [Docker][d] Swarm cluster atop Ubuntu 16.04. This cluster has 1-5 master VMs and a VM scaleset for workers/agents, plus the required network infrastructure:
+This is a barebones Azure Resource Manager template that automatically deploys a [Docker][d] Swarm cluster atop Ubuntu 18.04. This cluster has 1-5 master VMs and a VM scaleset for workers/agents, plus the required network infrastructure:
 
 ![Cluster diagram](generic-cluster.png) 
 
+The template defaults to deploying B-Series VMs (`B1ls`) with the smallest possible managed disk size (S4, 32GB).
+
 The key aspect of this template is that _you can add and remove agents at will_ simply by resizing the VM scaleset - the cluster comes with a few (very simple) helper scripts that allow nodes to join and leave the swarm as they are created/destroyed. 
 
 ## Why

genparams.py

@@ -48,10 +48,10 @@ def slurp(filename, as_template=False):
         "value": slurp("agent.yml")
     },
     "masterSize": {
-        "value": "Standard_F2"
+        "value": "Standard_B1ls"
     },
     "agentSize": {
-        "value": "Standard_F2"
+        "value": "Standard_B1ls"
     },
     "saType": {
         "value": "Standard_LRS"

templates/cluster.json

@@ -23,7 +23,7 @@
     },
     "masterSize": {
       "type": "string",
-      "defaultValue": "Standard_DS1_v2",
+      "defaultValue": "Standard_B1ls",
       "metadata": {
         "description": "Master instance size"
       },
@@ -58,7 +58,7 @@
     },
     "agentSize": {
       "type": "string",
-      "defaultValue": "Standard_DS1_v2",
+      "defaultValue": "Standard_B1ls",
       "metadata": {
         "description": "Agent instance size"
       },
@@ -216,7 +216,7 @@
           "imageReference": {
             "publisher": "Canonical",
             "offer": "UbuntuServer",
-            "sku": "16.04-LTS",
+            "sku": "18.04-LTS",
             "version": "latest"
           },
           "osDisk": {
@@ -269,7 +269,7 @@
         "capacity": "[parameters('agentCount')]"
       },
       "properties": {
-        "overprovision": "false",
+        "overprovision": false,
         "upgradePolicy": {
           "mode": "Manual"
         },
@@ -302,7 +302,7 @@
             "imageReference": {
               "publisher": "Canonical",
               "offer": "UbuntuServer",
-              "sku": "16.04-LTS",
+              "sku": "18.04-LTS",
               "version": "latest"
             }
           },