Merge pull request #868 from convox/20160715

[RELEASE] 20160715
convox · Jul 19, 2016 · dc73cbf · dc73cbf
2 parents 3469614 + 075b660
commit dc73cbf
Show file tree

Hide file tree

Showing 15 changed files with 2,036 additions and 63 deletions.
diff --git a/api/dist/kernel.json b/api/dist/kernel.json
@@ -221,6 +221,12 @@
       "Description": "The type of the instances in the runtime cluster",
       "Type": "String"
     },
+    "InstanceUpdateBatchSize": {
+      "Default": "1",
+      "Description": "The number of instances to update in a batch",
+      "MinValue": "1",
+      "Type": "Number"
+    },
     "Key": {
       "Default": "",
       "Description": "SSH key name for access to cluster instances",
@@ -1006,7 +1012,7 @@
       },
       "UpdatePolicy": {
         "AutoScalingRollingUpdate": {
-          "MaxBatchSize": "1",
+          "MaxBatchSize": { "Ref": "InstanceUpdateBatchSize" },
           "MinInstancesInService": { "Ref": "InstanceCount" },
           "PauseTime" : "PT15M",
           "SuspendProcesses": [

diff --git a/api/models/fixtures/balancer_labels.json b/api/models/fixtures/balancer_labels.json
@@ -1,6 +1,22 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
   "Conditions": {
+    "BalancerMainBlankHealthPath": {
+      "Fn::Equals": [
+        {
+          "Ref": "MainHealthPath"
+        },
+        ""
+      ]
+    },
+    "BalancerMainBlankHealthTimeout": {
+      "Fn::Equals": [
+        {
+          "Ref": "MainHealthTimeout"
+        },
+        ""
+      ]
+    },
     "BalancerMainPort443Proxy": {
       "Fn::Equals": [
         {
@@ -186,6 +202,16 @@
       "Description": "Number of processes to run, CPU units to reserve, and MB of RAM to reserve",
       "Type": "CommaDelimitedList"
     },
+    "MainHealthPath": {
+      "Default": "",
+      "Description": "Path used when health check protocol is http(s)",
+      "Type": "String"
+    },
+    "MainHealthTimeout": {
+      "Default": "3",
+      "MaxValue": 60,
+      "Type": "Number"
+    },
     "MainPort443Balancer": {
       "Default": "443",
       "Description": "",
@@ -297,19 +323,79 @@
         "CrossZone": true,
         "HealthCheck": {
           "HealthyThreshold": "2",
-          "Interval": 5,
+          "Interval": "5",
           "Target": {
             "Fn::Join": [
-              ":",
+              "",
               [
-                "TCP",
                 {
-                  "Ref": "MainPort443Host"
+                  "Fn::Join": [
+                    ":",
+                    [
+                      {
+                        "Fn::If": [
+                          "BalancerMainBlankHealthPath",
+                          {
+                            "Fn::If": [
+                              "BalancerMainPort443Secure",
+                              {
+                                "Fn::FindInMap": [
+                                  "PortProtocol",
+                                  "tcp",
+                                  "SecureInstanceProtocol"
+                                ]
+                              },
+                              {
+                                "Fn::FindInMap": [
+                                  "PortProtocol",
+                                  "tcp",
+                                  "InstanceProtocol"
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "Fn::If": [
+                              "BalancerMainPort443Secure",
+                              {
+                                "Fn::FindInMap": [
+                                  "PortProtocol",
+                                  "http",
+                                  "SecureInstanceProtocol"
+                                ]
+                              },
+                              {
+                                "Fn::FindInMap": [
+                                  "PortProtocol",
+                                  "http",
+                                  "InstanceProtocol"
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "Ref": "MainPort443Host"
+                      }
+                    ]
+                  ]
+                },
+                {
+                  "Ref": "MainHealthPath"
                 }
               ]
             ]
           },
-          "Timeout": 3,
+          "Timeout": {
+            "Fn::If": [
+              "BalancerMainBlankHealthTimeout",
+              "3",
+              {
+                "Ref": "MainHealthTimeout"
+              }
+            ]
+          },
           "UnhealthyThreshold": "2"
         },
         "LBCookieStickinessPolicy": [