usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [6/7] git commit: Added in graphite support to the existing cloud formation scripts
Date Fri, 18 Jul 2014 13:15:39 GMT
Added in graphite support to the existing cloud formation scripts


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

Branch: refs/heads/cloud-formation-scripts
Commit: 458d944d32a85b4e4f170b3745b02e8bba717244
Parents: 65ff681
Author: grey <greyes@apigee.com>
Authored: Tue Jul 15 09:29:23 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Tue Jul 15 09:29:23 2014 -0700

----------------------------------------------------------------------
 .../awscluster/src/main/groovy/wait_for_instances.groovy | 11 +++++------
 stack/awscluster/ugcluster-cf.json                       |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/458d944d/stack/awscluster/src/main/groovy/wait_for_instances.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/wait_for_instances.groovy b/stack/awscluster/src/main/groovy/wait_for_instances.groovy
index f6cf80a..c419160 100644
--- a/stack/awscluster/src/main/groovy/wait_for_instances.groovy
+++ b/stack/awscluster/src/main/groovy/wait_for_instances.groovy
@@ -17,11 +17,11 @@
  */
 
 
-// 
-// wait_for_instances.groovy 
-// 
+//
+// wait_for_instances.groovy
+//
 // Wait for enough Cassandra servers are up before proceding,
-// Enough means count greater than or equal to replication factor. 
+// Enough means count greater than or equal to replication factor.
 //
 import com.amazonaws.auth.*
 import com.amazonaws.services.simpledb.*
@@ -39,7 +39,7 @@ def creds = new BasicAWSCredentials(accessKey, secretKey)
 def sdbClient = new AmazonSimpleDBClient(creds)
 
 println "Waiting for Cassandra nodes to register..."
-    
+
 def count = 0
 
 while (true) {
@@ -66,7 +66,6 @@ while (true) {
         println("Found ${count} nodes but need at least ${cassNumServers}.  Waiting...")
     } catch (Exception e) {
         println "ERROR waiting for Casasndra ${e.getMessage()}, will continue waiting"
-        return
     }
     Thread.sleep(2000)
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/458d944d/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 4ed8ad6..53ecae1 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -20,8 +20,8 @@
       "RestMinServers":{
          "Description":"Minimum number of REST servers.",
          "Type":"Number",
-         "Default":"3",
-         "MinValue":"3"
+         "Default":"1",
+         "MinValue":"1"
       },
       "RestMaxServers":{
          "Description":"Maximum number REST servers.",
@@ -79,7 +79,7 @@
          "Description":"Cassandra replication factor",
          "Type":"Number",
          "Default":"3",
-         "MinValue":"3"
+         "MinValue":"1"
       },
       "SuperUserEmail":{
          "Description":"Email for superuser user",
@@ -211,7 +211,7 @@
                   "Fn::Join":[
                      "",
                      [
-                        "#!/bin/bash -ex\n",
+                        "#!/bin/bash -x\n",
                         "sudo git clone https://github.com/hopsoft/docker-graphite-statsd.git
\n",
                         "sudo ./docker-graphite-statsd/bin/start \n",
                         "sudo git clone https://github.com/dotcloud/collectd-graphite.git
\n",


Mime
View raw message