Merge pull request #3688 from carmstrong/ec2-customize_volume_sizes

feat(contrib/ec2): add support for custom volume sizes

Author: carmstrong

contrib/ec2/deis.template.json

@@ -103,6 +103,21 @@
       "Default": "internet-facing",
       "AllowedValues" : [ "internet-facing", "internal" ],
       "ConstraintDescription" : "must be either 'internet-facing' for public use, or 'internal' for private use"
+    },
+    "RootVolumeSize": {
+      "Description": "Desired size of the root volume, in GB",
+      "Type": "Number",
+      "Default": "50"
+    },
+    "DockerVolumeSize": {
+      "Description": "Desired size of the Docker volume, in GB",
+      "Type": "Number",
+      "Default": "100"
+    },
+    "EtcdVolumeSize": {
+      "Description": "Desired size of the etcd volume, in GB",
+      "Type": "Number",
+      "Default": "10"
     }
   },
 
@@ -271,15 +286,15 @@
         "BlockDeviceMappings" : [
           {
             "DeviceName" : { "Fn::FindInMap": [ "RootDevices", { "Ref": "EC2VirtualizationType" }, "Name" ] },
-            "Ebs" : { "VolumeSize" : "50", "VolumeType": { "Ref": "EC2EBSVolumeType" } }
+            "Ebs" : { "VolumeSize" : { "Ref": "RootVolumeSize" }, "VolumeType": { "Ref": "EC2EBSVolumeType" } }
           },
           {
             "DeviceName" : "/dev/xvdf",
-            "Ebs" : { "VolumeSize" : "100", "VolumeType": { "Ref": "EC2EBSVolumeType" } }
+            "Ebs" : { "VolumeSize" : { "Ref": "DockerVolumeSize" }, "VolumeType": { "Ref": "EC2EBSVolumeType" } }
           },
           {
             "DeviceName" : "/dev/xvdg",
-            "Ebs" : { "VolumeSize" : "10", "VolumeType": { "Ref": "EC2EBSVolumeType" } }
+            "Ebs" : { "VolumeSize" : { "Ref": "EtcdVolumeSize" }, "VolumeType": { "Ref": "EC2EBSVolumeType" } }
           }
         ]
       }

docs/installing_deis/aws.rst

@@ -79,7 +79,7 @@ Customize cloudformation.json
 -----------------------------
 
 Any of the parameter defaults defined in deis.template.json can be overridden by setting the value
-in `cloudformation.json`_. For example, to configure all of the optional settings:
+in `cloudformation.json`_. For example, to configure all of the options to non-default values:
 
 .. code-block:: console
 
@@ -102,11 +102,24 @@ in `cloudformation.json`_. For example, to configure all of the optional setting
     {
         "ParameterKey":     "ELBScheme",
         "ParameterValue":   "internal"
+    },
+    {
+        "ParameterKey":     "RootVolumeSize",
+        "ParameterValue":   "100"
+    },
+    {
+        "ParameterKey":     "DockerVolumeSize",
+        "ParameterValue":   "1000"
+    },
+    {
+        "ParameterKey":     "EtcdVolumeSize",
+        "ParameterValue":   "5"
     }
 
 
 The only entry in cloudformation.json required to launch your cluster is `KeyPair`, which is
-already filled out. The defaults will be applied for the other settings.
+already filled out. The defaults will be applied for the other settings. The default values are
+defined in deis.template.json.
 
 If updated with update-ec2-cluster.sh, the InstanceType will only impact newly deployed instances
 (`#1758`_).