usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [03/16] incubator-usergrid git commit: Updated gatling cluster launcher to tag instances
Date Wed, 03 Dec 2014 17:58:18 GMT
Updated gatling cluster launcher to tag instances


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

Branch: refs/heads/two-dot-o
Commit: 1f75549e9971f80ff56cc60774318e6f08a4cb38
Parents: 6d4a823
Author: Todd Nine <tnine@apigee.com>
Authored: Mon Nov 24 17:47:47 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Mon Nov 24 17:47:47 2014 -0700

----------------------------------------------------------------------
 stack/awscluster/gatling-cluster-cf.json | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1f75549e/stack/awscluster/gatling-cluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/gatling-cluster-cf.json b/stack/awscluster/gatling-cluster-cf.json
index 16b8d5b..ff41f14 100644
--- a/stack/awscluster/gatling-cluster-cf.json
+++ b/stack/awscluster/gatling-cluster-cf.json
@@ -216,20 +216,22 @@
                     "apt-get install zip unzip wget -y\n",
                     "wget https://bootstrap.pypa.io/ez_setup.py -O - | python\n",
                     "easy_install  https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz\n",
-                    "/usr/local/bin/cfn-init -v ",
+                    "## These don't seem to work correctly and cause script to bail.  Temporarily
removing \n",
+                    "#/usr/local/bin/cfn-init -v ",
                     "         --stack ", { "Ref" : "AWS::StackName" },
                     "         --resource LaunchConfig ",
                     "         --region ", { "Ref" : "AWS::Region" }, "\n",
 
-                    "/usr/local/bin/cfn-signal -e $? ",
+                    "#/usr/local/bin/cfn-signal -e $? ",
                     "         --stack ", { "Ref" : "AWS::StackName" },
                     "         --resource GatlingServerGroup ",
                     "         --region ", { "Ref" : "AWS::Region" }, "\n",
 
-                    "add-apt-repository ppa:webupd8team/java\n",
+                    "add-apt-repository ppa:webupd8team/java --yes\n",
+                    "apt-add-repository ppa:awstools-dev/awstools --yes\n",
                     "apt-get update\n",
                     "echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select
true | /usr/bin/debconf-set-selections\n",
-                    "apt-get install oracle-java7-installer oracle-java7-set-default expect
expect-dev git -y --force-yes\n",
+                    "apt-get install oracle-java7-installer oracle-java7-set-default expect
expect-dev git ec2-api-tools -y --force-yes\n",
                     "update-java-alternatives -s java-7-oracle\n",
 
                     "mkdir -p /usr/local/apache-maven\n",
@@ -238,7 +240,8 @@
                     "tar -xzvf apache-maven-3.1.1-bin.tar.gz\n",
                     "cd ~ubuntu\n",
                     "git clone https://github.com/apache/incubator-usergrid.git usergrid\n",
-                    "chown -R ubuntu:ubuntu usergrid\n"
+                    "chown -R ubuntu:ubuntu usergrid\n",
+                    "ec2-create-tags $(curl -k http://169.254.169.254/latest/meta-data/instance-id)
 --aws-access-key ",{ "Ref":"GatlingKey" }, " --aws-secret-key ", { "Fn::GetAtt":[ "GatlingKey",
"SecretAccessKey" ] } ," --tag Name=", { "Ref":"AWS::StackName"  }, "-Gatling\n"
                 ]]}}
             }
         },
@@ -356,4 +359,4 @@
             "Value" :  { "Fn::Join" : [ "", [ "http://", { "Fn::GetAtt" : [ "ElasticLoadBalancer",
"DNSName" ]}]]}
         }
     }
-}
\ No newline at end of file
+}


Mime
View raw message