usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [05/16] incubator-usergrid git commit: Removed unused params in gatling cluster. Moved signal of success to last step
Date Wed, 03 Dec 2014 17:58:20 GMT
Removed unused params in gatling cluster.  Moved signal of success to last step

Updated key selection to be a drop down of valid ssh keys


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

Branch: refs/heads/two-dot-o
Commit: 65a018f8c06090d043d6016cc713941c1f30a91d
Parents: b12130f
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Nov 26 10:50:18 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Nov 26 10:50:18 2014 -0700

----------------------------------------------------------------------
 stack/awscluster/gatling-cluster-cf.json | 19 +++++++------------
 stack/awscluster/ugcluster-cf.json       |  7 ++++---
 2 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/65a018f8/stack/awscluster/gatling-cluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/gatling-cluster-cf.json b/stack/awscluster/gatling-cluster-cf.json
index b9f9752..59090de 100644
--- a/stack/awscluster/gatling-cluster-cf.json
+++ b/stack/awscluster/gatling-cluster-cf.json
@@ -11,13 +11,13 @@
         "KeyName": {
             "Description": "Name of an existing EC2 KeyPair to enable SSH access to the instance",
             "Type": "AWS::EC2::KeyPair::KeyName",
-            "Default": "jenkins-east",
+            "Default": "ug-cloudformation",
             "ConstraintDescription": "must be the name of an existing EC2 KeyPair."
         },
         "InstanceType": {
             "Description": "WebServer EC2 instance type",
             "Type": "String",
-            "Default": "m1.xlarge",
+            "Default": "c3.xlarge",
             "AllowedValues": [
                 "t1.micro",
                 "t2.micro",
@@ -66,11 +66,6 @@
             "ConstraintDescription": "must be a valid email address.",
             "Default": "rbridges@apigee.com"
         },
-        "ReleaseBucket": {
-            "Description": "S3 Bucket where Usergrid assembly is to be found.",
-            "Type": "String",
-            "Default": "usergrid-jenkins-builds"
-        },
         "SSHLocation": {
             "Description": "The IP address range that can be used to SSH to the EC2 instances",
             "Type": "String",
@@ -253,15 +248,11 @@
                     "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",
 
-                    "#/usr/local/bin/cfn-signal -e $? ",
-                    "         --stack ", { "Ref" : "AWS::StackName" },
-                    "         --resource GatlingServerGroup ",
-                    "         --region ", { "Ref" : "AWS::Region" }, "\n",
 
                     "add-apt-repository ppa:webupd8team/java --yes\n",
                     "apt-add-repository ppa:awstools-dev/awstools --yes\n",
@@ -273,6 +264,10 @@
                     "cd ~ubuntu\n",
                     "git clone -b ",{ "Ref":"Branch" } , " https://github.com/apache/incubator-usergrid.git
usergrid\n",
                     "chown -R ubuntu:ubuntu usergrid\n",
+
+
+                    "/usr/local/bin/cfn-signal --success true --stack ", { "Ref" : "AWS::StackName"
}, " --resource GatlingServerGroup --region ", { "Ref" : "AWS::Region" }, "\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"
                 ]]}}
             }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/65a018f8/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 5b599ec..02058e5 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -47,9 +47,10 @@
             "ConstraintDescription": "must be valid instance type."
         },
         "KeyPair": {
-            "Description": "EC2 key pair to be use for SSH access",
-            "Type": "String",
-            "Default": "ug-cloudformation"
+          "Description": "Name of an existing EC2 KeyPair to enable SSH access to the instance",
+          "Type": "AWS::EC2::KeyPair::KeyName",
+          "Default": "ug-cloudformation",
+          "ConstraintDescription": "must be the name of an existing EC2 KeyPair."
         },
         "CassClusterName": {
             "Description": "Name to be used for Cassandra cluster.",


Mime
View raw message