usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [1/2] incubator-usergrid git commit: Update cloud formation configuration for gatling load testing cluster. Added region to tag creation so this could be used in any AWS region.
Date Mon, 27 Jul 2015 15:22:34 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev c4312eff3 -> 5efe71203


Update cloud formation configuration for gatling load testing cluster.  Added region to tag
creation so this could be used in any AWS region.


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

Branch: refs/heads/two-dot-o-dev
Commit: 4f5d335217dec9407a55f68cbaeed7ca054178ea
Parents: 23ce4c5
Author: Michael Russo <michaelarusso@gmail.com>
Authored: Wed Jul 22 10:03:46 2015 -0700
Committer: Michael Russo <michaelarusso@gmail.com>
Committed: Wed Jul 22 10:03:46 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f5d3352/stack/awscluster/gatling-cluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/gatling-cluster-cf.json b/stack/awscluster/gatling-cluster-cf.json
index eaf004a..fadb4fc 100644
--- a/stack/awscluster/gatling-cluster-cf.json
+++ b/stack/awscluster/gatling-cluster-cf.json
@@ -1,6 +1,6 @@
 {
     "AWSTemplateFormatVersion" : "2010-09-09",
-    "Description" : "Gatling cluster",
+    "Description" : "Gatling Cluster",
     "Parameters": {
         "InstanceCount": {
             "Description": "The number of gatling instances to create",
@@ -57,14 +57,13 @@
                 "cc2.8xlarge",
                 "cg1.4xlarge"
             ],
-            "ConstraintDescription": "must be a valid EC2 instance type."
+            "ConstraintDescription": "Must be a valid EC2 instance type."
         },
         "OperatorEMail": {
-            "Description": "EMail address to notify if there are any scaling operations",
+            "Description": "Email address to notify if there are any scaling operations",
             "Type": "String",
             "AllowedPattern": "([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)",
-            "ConstraintDescription": "must be a valid email address.",
-            "Default": "rbridges@apigee.com"
+            "ConstraintDescription": "Must be a valid email address."
         },
         "SSHLocation": {
             "Description": "The IP address range that can be used to SSH to the EC2 instances",
@@ -73,12 +72,12 @@
             "MaxLength": "18",
             "Default": "0.0.0.0/0",
             "AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})",
-            "ConstraintDescription": "must be a valid IP CIDR range of the form x.x.x.x/x."
+            "ConstraintDescription": "Must be a valid IP CIDR range of the form x.x.x.x/x."
         },
         "Branch": {
             "Description": "The branch of usergrid to check out",
             "Type": "String",
-            "Default": "two-dot-o"
+            "Default": "two-dot-o-dev"
         }
     },
 
@@ -239,7 +238,7 @@
                 "ImageId" : {
                     "Fn::FindInMap" : [
                         "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },
-                           { "Fn::FindInMap" : [ "AWSInstanceType2Arch", "m1.xlarge", "Arch"
] } ]},
+                           { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType"
}, "Arch" ] } ]},
                 "SecurityGroups" : [ { "Ref" : "InstanceSecurityGroup" } ],
                 "InstanceType" : { "Ref" : "InstanceType" },
                 "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
@@ -248,25 +247,24 @@
                     "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",
-                    "## These don't seem to work correctly and cause script to bail.  Temporarily
removing \n",
-                    "#/usr/local/bin/cfn-init -v ",
+                    "/usr/local/bin/cfn-init -v ",
                     "         --stack ", { "Ref" : "AWS::StackName" },
                     "         --resource LaunchConfig ",
                     "         --region ", { "Ref" : "AWS::Region" }, "\n",
 
 
                     "add-apt-repository ppa:webupd8team/java --yes\n",
-                    "apt-add-repository ppa:awstools-dev/awstools --yes\n",
+                    "add-apt-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 ec2-api-tools maven -y --force-yes\n",
-                    "update-java-alternatives -s java-7-oracle\n",
+                    "echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select
true | /usr/bin/debconf-set-selections\n",
+                    "apt-get install oracle-java8-installer oracle-java8-set-default expect
expect-dev git ec2-api-tools maven -y --force-yes\n",
+                    "update-java-alternatives -s java-8-oracle\n",
 
                     "cd ~ubuntu\n",
                     "git clone -b ",{ "Ref":"Branch" } , " https://github.com/apache/incubator-usergrid.git
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",
+                    "ec2-create-tags $(curl -k http://169.254.169.254/latest/meta-data/instance-id)
--region ", { "Ref" : "AWS::Region" }," --aws-access-key ",{ "Ref":"GatlingKey" }, " --aws-secret-key
", { "Fn::GetAtt":[ "GatlingKey", "SecretAccessKey" ] } ," --tag Name=", { "Ref":"AWS::StackName"
 }, "\n",
                     "/usr/local/bin/cfn-signal --success true --stack ", { "Ref" : "AWS::StackName"
}, " --resource GatlingServerGroup --region ", { "Ref" : "AWS::Region" }, "\n"
                 ]]}}
             }


Mime
View raw message