You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/17 18:35:04 UTC
[17/49] git commit: more cloudformation updates
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/59fed6a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/59fed6a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/59fed6a1
Branch: refs/heads/two-dot-o
Commit: 59fed6a1ac56f627c29eb54112649700124b523e
Parents: dd4f117
Author: amuramoto <am...@apigee.com>
Authored: Sun Oct 12 03:42:58 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sun Oct 12 03:42:58 2014 -0700
----------------------------------------------------------------------
.../src/main/dist/init_instance/install_elasticsearch.sh | 4 ++--
stack/awscluster/ugcluster-cf.json | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/59fed6a1/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
index dc7ee8f..d6e4285 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -39,8 +39,8 @@ chown elasticsearch /mnt/log/elasticsearch
cd /usr/share/usergrid/scripts
# No need to do this, elasticsearch nodes are also cassandra nodes
-#groovy registry_register.groovy elasticsearch
-#groovy wait_for_instances.groovy elasticsearch ${CASSANDRA_NUM_SERVERS}
+groovy registry_register.groovy elasticsearch
+groovy wait_for_instances.groovy elasticsearch ${ES_NUM_SERVERS}
# leave room for Cassandra: use about one half of RAM for heap
case `(curl http://169.254.169.254/latest/meta-data/instance-type)` in
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/59fed6a1/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 197eb6c..93c7e86 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -668,6 +668,7 @@
"export ES_SECURITY_GROUP_NAME=", { "Ref":"ESSecurityGroup" }, "\n",
"\n",
"\n",
+ "export ES_CLUSTER_NAME=", { "Ref":"CassClusterName" }, "\n",
"export ES_NUM_SERVERS=", { "Ref":"ESNumServers" }, "\n",
"export GRAPHITE_NUM_SERVERS=", { "Ref":"GraphiteNumServers" }, "\n",
"\n",