Merge pull request #3074 from carmstrong/pr-2864

feat(contrib/ec2): add support for internal ELBs

Author: carmstrong

contrib/ec2/deis.template.json

@@ -91,6 +91,13 @@
       "Default": "true",
       "AllowedValues" : [ "true", "false" ],
       "ConstraintDescription" : "must be either true or false"
+    },
+    "ELBScheme": {
+      "Description": "Whether to create an internal-only load balancer, or a public-facing one (default)",
+      "Type": "String",
+      "Default": "internet-facing",
+      "AllowedValues" : [ "internet-facing", "internal" ],
+      "ConstraintDescription" : "must be either 'internet-facing' for public use, or 'internal' for private use"
     }
   },
 
@@ -271,6 +278,7 @@
       "Type": "AWS::ElasticLoadBalancing::LoadBalancer",
       "DependsOn" : "GatewayToInternet",
       "Properties": {
+        "Scheme" : {"Ref": "ELBScheme"},
         "HealthCheck": {
           "HealthyThreshold": "4",
           "Interval": "15",

docs/installing_deis/aws.rst

@@ -80,7 +80,7 @@ Customize cloudformation.json
 -----------------------------
 
 Any of the parameter defaults defined in deis.template.json can be overridden by setting the value
-in `cloudformation.json`_ like so:
+in `cloudformation.json`_. For example, to configure all of the optional settings:
 
 .. code-block:: console
 
@@ -99,8 +99,13 @@ in `cloudformation.json`_ like so:
     {
         "ParameterKey":     "AssociatePublicIP",
         "ParameterValue":   "false"
+    },
+    {
+        "ParameterKey":     "ELBScheme",
+        "ParameterValue":   "internal"
     }
 
+
 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.
 
@@ -175,15 +180,15 @@ start installing the platform.
 CloudFormation Updates
 ----------------------
 
-To use CloudFormation to perform update operations to your stack, there is another script: 
+To use CloudFormation to perform update operations to your stack, there is another script:
 `update_ec2_cluster.sh`_. Depending on the parameters that you have changed, CloudFormation
 may replace the EC2 instances in your stack.
 
 The following parameters can be changed without replacing all instances in a stack:
 
 - ``ClusterSize`` - Number of nodes in the cluster. This may launch new instances or terminate
   existing instances. If you are scaling down, this may interrupt service. If a container
-  was running on an instance that was terminated, it will have to be rebalanced onto another 
+  was running on an instance that was terminated, it will have to be rebalanced onto another
   node which will cause some downtime.
 - ``SSHFrom`` - Locks down SSH access to the Deis hosts. This will update the security
   group for the Deis hosts.