usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [3/3] git commit: Add support for c3.2xlarge to AWS Cluster template.
Date Fri, 22 Aug 2014 18:48:30 GMT
Add support for c3.2xlarge to AWS Cluster template.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/839ac295
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/839ac295
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/839ac295

Branch: refs/heads/two-dot-o
Commit: 839ac295e20d8f214fbfa9536d3afa7e9f2b1e4b
Parents: bc3ad2a
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Aug 22 14:44:50 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri Aug 22 14:44:50 2014 -0400

----------------------------------------------------------------------
 .../src/main/dist/init_instance/init_rest_server.sh       |  4 ++++
 stack/awscluster/ugcluster-cf.json                        | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839ac295/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
index 7a8954e..d069d0d 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
@@ -77,6 +77,10 @@ case `(curl http://169.254.169.254/latest/meta-data/instance-type)` in
     export TOMCAT_RAM=6G
     export TOMCAT_THREADS=1600
 ;;
+'c3.2xlarge' )
+    export TOMCAT_RAM=12G
+    export TOMCAT_THREADS=2000
+;;
 'c3.4xlarge' )
     export TOMCAT_RAM=24G
     export TOMCAT_THREADS=4000

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839ac295/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 9c4885f..1de4e54 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -40,6 +40,7 @@
                 "m1.xlarge",
                 "m3.xlarge",
                 "m3.large",
+                "c3.2xlarge",
                 "c3.4xlarge"
             ],
             "ConstraintDescription": "must be valid instance type."
@@ -63,7 +64,7 @@
         "CassInstanceType": {
             "Description": "Instance type for Cass servers",
             "Type": "String",
-            "Default": "c3.4xlarge",
+            "Default": "c3.2xlarge",
             "AllowedValues": [
                 "m1.small",
                 "m1.medium",
@@ -71,6 +72,7 @@
                 "m1.xlarge",
                 "m3.xlarge",
                 "m3.2xlarge",
+                "c3.2xlarge",
                 "c3.4xlarge"
             ],
             "ConstraintDescription": "must be valid instance type."
@@ -151,6 +153,9 @@
             "c3.2xlarge": {
                 "Arch": "64"
             },
+            "c3.2xlarge": {
+                "Arch": "64"
+            },
             "c3.4xlarge": {
                 "Arch": "64"
             }
@@ -857,7 +862,8 @@
                     "UnhealthyThreshold": "8",
                     "Interval": "30",
                     "Timeout": "5"
-                }
+                },
+                "CrossZone": "true"
             }
         },
         "NotificationTopic": {


Mime
View raw message