usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [3/4] git commit: Bug fixes in ElasticSearch & Cassandra setup.
Date Mon, 03 Feb 2014 16:20:43 GMT
Bug fixes in ElasticSearch & Cassandra setup.


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

Branch: refs/heads/two-dot-o
Commit: 69b9c632e62446324b20233b85f3c8c637b48c24
Parents: 894279d
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Sun Feb 2 13:03:17 2014 -0500
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Sun Feb 2 13:03:17 2014 -0500

----------------------------------------------------------------------
 stack/corepersistence/priamcluster/cassandra-cf.json         | 7 +------
 .../src/main/dist/init_instance/init_instance.sh             | 2 ++
 .../src/main/dist/init_instance/install_elasticsearch.sh     | 8 +++-----
 .../src/main/groovy/configure_elasticsearch.groovy           | 6 +++---
 4 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/69b9c632/stack/corepersistence/priamcluster/cassandra-cf.json
----------------------------------------------------------------------
diff --git a/stack/corepersistence/priamcluster/cassandra-cf.json b/stack/corepersistence/priamcluster/cassandra-cf.json
index 8711a23..a28cf48 100644
--- a/stack/corepersistence/priamcluster/cassandra-cf.json
+++ b/stack/corepersistence/priamcluster/cassandra-cf.json
@@ -26,7 +26,7 @@
         "CassInstanceType": {
             "Description": "Instance type for Cass servers",
             "Type": "String",
-            "Default": "m1.small",
+            "Default": "m1.xlarge",
             "AllowedValues": ["m1.small", "m1.medium", "m1.large", "m1.xlarge", "m3.xlarge",
"m3.2xlarge"],
             "ConstraintDescription": "must be valid instance type."
         },
@@ -278,11 +278,6 @@
                         "FromPort": "22",
                         "ToPort": "22",
                         "CidrIp": "0.0.0.0/0"
-                    }, {
-                        "IpProtocol": "tcp",
-                        "FromPort": "9160",
-                        "ToPort": "9160",
-                        "SourceSecurityGroupName": {"Ref": "RestSecurityGroup"}
                     }]
             }
         },

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/69b9c632/stack/corepersistence/priamcluster/src/main/dist/init_instance/init_instance.sh
----------------------------------------------------------------------
diff --git a/stack/corepersistence/priamcluster/src/main/dist/init_instance/init_instance.sh
b/stack/corepersistence/priamcluster/src/main/dist/init_instance/init_instance.sh
index 46dbbf7..552df78 100644
--- a/stack/corepersistence/priamcluster/src/main/dist/init_instance/init_instance.sh
+++ b/stack/corepersistence/priamcluster/src/main/dist/init_instance/init_instance.sh
@@ -10,6 +10,7 @@ dpkg-reconfigure -f noninteractive tzdata
 . /etc/profile.d/aws-credentials.sh
 . /etc/profile.d/usergrid-env.sh
 
+cd /usr/share/usergrid/init_instance
 ./create_raid0.sh
 
 # Install the easy stuff
@@ -29,6 +30,7 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
 rm /home/ubuntu/.groovy/lib/stax*
 ln -s /home/ubuntu/.groovy /root/.groovy
 
+cd /usr/share/usergrid/init_instance
 ./install_oraclejdk.sh 
 
 # Install and stop Cassandra 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/69b9c632/stack/corepersistence/priamcluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/corepersistence/priamcluster/src/main/dist/init_instance/install_elasticsearch.sh
b/stack/corepersistence/priamcluster/src/main/dist/init_instance/install_elasticsearch.sh
index 8351cf6..080fa9a 100644
--- a/stack/corepersistence/priamcluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/corepersistence/priamcluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -3,8 +3,6 @@
 # Install and stop ElasticSearch
 pushd /etc/apt/sources.list.d
 
-
-
 cat >> elasticsearch.sources.list << EOF
 deb http://packages.elasticsearch.org/elasticsearch/1.0/debian stable main
 EOF
@@ -12,10 +10,10 @@ apt-get update
 apt-get --force-yes -y install elasticsearch
 /etc/init.d/elasticsearch stop
 
-mkdir /mnt/data/elasticsearch
-chown elasticsearch /mnt/data/elasticsearch]
+mkdir -p /mnt/data/elasticsearch
+chown elasticsearch /mnt/data/elasticsearch
 
-mkdir /mnt/log/elasticsearch
+mkdir -p /mnt/log/elasticsearch
 chown elasticsearch /mnt/log/elasticsearch
 
 # Configure and restart ElasticSearch

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/69b9c632/stack/corepersistence/priamcluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/corepersistence/priamcluster/src/main/groovy/configure_elasticsearch.groovy
b/stack/corepersistence/priamcluster/src/main/groovy/configure_elasticsearch.groovy
index 6437b5f..6b90e17 100644
--- a/stack/corepersistence/priamcluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/corepersistence/priamcluster/src/main/groovy/configure_elasticsearch.groovy
@@ -38,10 +38,10 @@ discovery.zen.ping.unicast.hosts: [${seeds}]
 node:
     name: ${hostName} 
 network:
-    host: ${hostName}\
+    host: ${hostName}
 path:
-  logs: /mnt/log/elasticsearch
-  data: /mnt/data/elasticsearch
+    logs: /mnt/log/elasticsearch
+    data: /mnt/data/elasticsearch
 """
 
 println elasticSearchConfig


Mime
View raw message