Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B57781747F for ; Tue, 4 Nov 2014 22:59:24 +0000 (UTC) Received: (qmail 14833 invoked by uid 500); 4 Nov 2014 22:59:24 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 14776 invoked by uid 500); 4 Nov 2014 22:59:24 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 14537 invoked by uid 99); 4 Nov 2014 22:59:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 22:59:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2EE0893269C; Tue, 4 Nov 2014 22:59:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Tue, 04 Nov 2014 22:59:35 -0000 Message-Id: <18343d637dc34cf586cdb3ede31c16df@git.apache.org> In-Reply-To: <2135bf186ed849ab83b0bfa2668055b6@git.apache.org> References: <2135bf186ed849ab83b0bfa2668055b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/14] git commit: Changes from merging Ryan's changes in. Now auto migrates and runs system setup Changes from merging Ryan's changes in. Now auto migrates and runs system 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/839f817f Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/839f817f Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/839f817f Branch: refs/heads/key-row-sharding Commit: 839f817f7d723d387c47672ea241b8a4d3b2cc04 Parents: 179bc18 Author: Todd Nine Authored: Tue Nov 4 15:58:48 2014 -0700 Committer: Todd Nine Committed: Tue Nov 4 15:58:48 2014 -0700 ---------------------------------------------------------------------- stack/awscluster/pom.xml | 405 +++++++++++-------- .../main/dist/init_instance/init_rest_server.sh | 12 + .../groovy/configure_opscenter_usergrid.groovy | 6 +- stack/awscluster/ugcluster-cf.json | 18 +- 4 files changed, 249 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/stack/awscluster/pom.xml ---------------------------------------------------------------------- diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml index 9af3da6..4a8f4d6 100644 --- a/stack/awscluster/pom.xml +++ b/stack/awscluster/pom.xml @@ -1,186 +1,237 @@ - - 4.0.0 - - awscluster - org.usergrid - 1.0-SNAPSHOT - - awscluster - - - Creates bundle for initializing a Tomcat and Cassandra Usergrid cluster via CloudFormation - - - - UTF-8 - usergrid-jenkins-builds - ../rest/target/ROOT.war - ../../portal/dist/usergrid-portal - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - make-assembly - package - - single - - - - - - assembly.xml - - gnu - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - - deploy - - java - - upload-scripts - - true - true - runtime - - net.java.dev.jets3t - jets3t - - org.jets3t.apps.synchronize.Synchronize - - --nodelete - --properties - ${project.basedir}/aws.properties - UP - ${aws.s3.release-bucket} - ${project.build.directory}/${project.build.finalName}-any.tar.gz - - - - - deploy - - java - - upload-war - - true - true - runtime - - net.java.dev.jets3t - jets3t - - org.jets3t.apps.synchronize.Synchronize - - --nodelete - --properties - ${project.basedir}/aws.properties - UP - ${aws.s3.release-bucket} - ${stack.war} - - - - - - - net.java.dev.jets3t - jets3t - 0.8.0 - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - true - - - - maven-compiler-plugin - 2.3.2 - - - org.codehaus.groovy - groovy-eclipse-compiler - 2.6.0-01 - - - - groovy-eclipse-compiler - - - - groovy-eclipse-compiler - org.codehaus.groovy - 2.6.0-01 - true - - - - - - - - - net.java.dev.jets3t - synchronize - 0.8.0 - - - + + 4.0.0 + + awscluster + org.usergrid + 1.0-SNAPSHOT + + awscluster + + + Creates bundle for initializing a Tomcat and Cassandra Usergrid cluster via CloudFormation + + + + UTF-8 + ug-cloudformation + + + ../rest/target/ROOT.war + ../../portal/dist/usergrid-portal + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + make-assembly + package + + single + + + + + + assembly.xml + + gnu + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2 + + + + + deploy + + java + + upload-scripts + + true + true + runtime + + net.java.dev.jets3t + jets3t + + org.jets3t.apps.synchronize.Synchronize + + --nodelete + --properties + ${project.basedir}/aws.properties + UP + ${aws.s3.release-bucket} + ${project.build.directory}/${project.build.finalName}-any.tar.gz + + + + + + + deploy + + java + + upload-war + + true + true + runtime + + net.java.dev.jets3t + jets3t + + org.jets3t.apps.synchronize.Synchronize + + --nodelete + --properties + ${project.basedir}/aws.properties + UP + ${aws.s3.release-bucket} + ${stack.war} + + + + + + net.java.dev.jets3t jets3t 0.8.0 - - - - com.amazonaws - aws-java-sdk - 1.6.7 - - - groovy-all + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.1 + + true + + + + maven-compiler-plugin + 2.3.2 + + org.codehaus.groovy - 2.0.5 - - + groovy-eclipse-compiler + 2.6.0-01 + + + + groovy-eclipse-compiler + + + + groovy-eclipse-compiler + org.codehaus.groovy + 2.6.0-01 + true + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.9 + + + + properties + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2 + + + + exec + + generate-sources + + + + echo + + stack.war= + ${stack.war} + + + + + + + + + + + net.java.dev.jets3t + synchronize + 0.8.0 + + + + net.java.dev.jets3t + jets3t + 0.8.0 + + + + com.amazonaws + aws-java-sdk + 1.6.7 + + + groovy-all + org.codehaus.groovy + 2.0.5 + + + + + org.apache.usergrid + usergrid-rest + + 2.0.0-SNAPSHOT + war + + http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/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 0e65c9a..a255d31 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 @@ -200,6 +200,18 @@ apt-get install -y postfix # Go sh /etc/init.d/tomcat7 start +#Wait for tomcat to start, then run our migrations + + +#Wait until tomcat starts and we can hit our status page +until curl -m 1 -I -X GET http://localhost:8080/status | grep "200 OK"; do sleep 5; done + +#Run the migration +curl -X PUT http://ugtest.usergrid.com/system/migrate/run -u superuser:test + +#Run the system database setup +curl -X GET http://localhost:8080/system/database/setup -u superuser:test + # tag last so we can see in the console that the script ran to completion cd /usr/share/usergrid/scripts groovy tag_instance.groovy http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy ---------------------------------------------------------------------- diff --git a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy index 150018c..df4dcae 100644 --- a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy +++ b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy @@ -48,9 +48,9 @@ def usergridConfig = """ seed_hosts = ${seeds} #TODO, this doesn't seem to work, I think opscenter is broken. Try this again at a later time and remove opscenter exclusion below -[storage_cassandra] -seed_hosts = ${hostName} -api_port = 9160 +#[storage_cassandra] +#seed_hosts = ${hostName} +#api_port = 9160 """ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/stack/awscluster/ugcluster-cf.json ---------------------------------------------------------------------- diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json index 087c67a..c8b96ee 100644 --- a/stack/awscluster/ugcluster-cf.json +++ b/stack/awscluster/ugcluster-cf.json @@ -15,7 +15,7 @@ "ReleaseBucket": { "Description": "S3 Bucket where Usergrid assembly is to be found.", "Type": "String", - "Default": "usergrid-jenkins-builds" + "Default": "ug-cloudformation" }, "RestMinServers": { "Description": "Minimum number of REST servers.", @@ -49,7 +49,7 @@ "KeyPair": { "Description": "EC2 key pair to be use for SSH access", "Type": "String", - "Default": "jenkins-east" + "Default": "ug-cloudformation" }, "CassClusterName": { "Description": "Name to be used for Cassandra cluster.", @@ -144,7 +144,7 @@ "OpsCenterInstanceType": { "Description": "Instance type for Opscenter server", "Type": "String", - "Default": "c3.xlarge", + "Default": "c3.large", "AllowedValues": [ "c3.large", "c3.xlarge", @@ -319,11 +319,9 @@ "apt-get update\n", "apt-get -y install s3cmd\n", "cd /usr/share/usergrid\n", - "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n", - "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n", + "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n", "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n", "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n", - "mv ROOT.war webapps/ROOT.war\n", "chmod 755 ./init_instance/*.sh\n", "cd ./init_instance\n", "# Init as a REST intance \n", @@ -767,11 +765,9 @@ "apt-get update\n", "apt-get -y install s3cmd\n", "cd /usr/share/usergrid\n", - "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n", - "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n", + "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n", "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n", "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n", - "mv ROOT.war webapps/ROOT.war\n", "chmod 755 ./init_instance/*.sh\n", "cd ./init_instance\n", "# init as a Cassandra node \n", @@ -930,11 +926,9 @@ "apt-get update\n", "apt-get -y install s3cmd\n", "cd /usr/share/usergrid\n", - "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n", - "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n", + "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n", "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n", "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n", - "mv ROOT.war webapps/ROOT.war\n", "chmod 755 ./init_instance/*.sh\n", "cd ./init_instance\n", "# init as an ES node \n",