You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/15 19:33:26 UTC
[4/4] git commit: Added temporary tagging as instances start
Added temporary tagging as instances start
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b0d16054
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b0d16054
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b0d16054
Branch: refs/heads/cloudformation-update
Commit: b0d1605409b714e13d06d9be1ccdd6dfa919e673
Parents: 6c632f8
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 15 11:08:32 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 15 11:09:50 2014 -0600
----------------------------------------------------------------------
.../src/main/dist/init_instance/init_db_server.sh | 7 +++++++
.../src/main/dist/init_instance/init_es_server.sh | 6 ++++++
.../src/main/dist/init_instance/init_graphite_server.sh | 6 ++++++
.../src/main/dist/init_instance/init_rest_server.sh | 9 ++++++++-
stack/awscluster/src/main/groovy/tag_instance.groovy | 10 +++++++++-
5 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_db_server.sh b/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
index a37bb82..a46e7f9 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
@@ -18,6 +18,9 @@
# directory of this distribution.
#
+
+
+
echo "${HOSTNAME}" > /etc/hostname
echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
hostname `cat /etc/hostname`
@@ -49,6 +52,10 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
rm /home/ubuntu/.groovy/lib/stax*
ln -s /home/ubuntu/.groovy /root/.groovy
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
cd /usr/share/usergrid/init_instance
./install_oraclejdk.sh
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_es_server.sh b/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
index c187cb8..fbe41ab 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
@@ -18,6 +18,8 @@
# directory of this distribution.
#
+
+
echo "${HOSTNAME}" > /etc/hostname
echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
hostname `cat /etc/hostname`
@@ -49,6 +51,10 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
rm /home/ubuntu/.groovy/lib/stax*
ln -s /home/ubuntu/.groovy /root/.groovy
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
cd /usr/share/usergrid/init_instance
./install_oraclejdk.sh
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh b/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
index a9d74c0..b095f2b 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
@@ -18,6 +18,8 @@
# directory of this distribution.
#
+
+
echo "${HOSTNAME}" > /etc/hostname
echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
hostname `cat /etc/hostname`
@@ -49,6 +51,10 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
rm /home/ubuntu/.groovy/lib/stax*
ln -s /home/ubuntu/.groovy /root/.groovy
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
cd /usr/share/usergrid/init_instance
./install_oraclejdk.sh
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/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 96da354..75edc16 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
@@ -18,6 +18,8 @@
# directory of this distribution.
#
+
+
echo "${HOSTNAME}" > /etc/hostname
echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
hostname `cat /etc/hostname`
@@ -39,6 +41,11 @@ cp /usr/share/aws-java-sdk-*/third-party/*/*.jar /home/ubuntu/.groovy/lib
cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
ln -s /home/ubuntu/.groovy /root/.groovy
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
+
# Build environment for Groovy scripts
. /etc/profile.d/aws-credentials.sh
. /etc/profile.d/usergrid-env.sh
@@ -145,4 +152,4 @@ sh /etc/init.d/tomcat7 start
# tag last so we can see in the console that the script ran to completion
cd /usr/share/usergrid/scripts
-groovy tag_instance.groovy
\ No newline at end of file
+groovy tag_instance.groovy
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/groovy/tag_instance.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/tag_instance.groovy b/stack/awscluster/src/main/groovy/tag_instance.groovy
index 7e5ed84..99d3288 100644
--- a/stack/awscluster/src/main/groovy/tag_instance.groovy
+++ b/stack/awscluster/src/main/groovy/tag_instance.groovy
@@ -32,6 +32,14 @@ String secretKey = (String)System.getenv().get("AWS_SECRET_KEY")
String instanceId = (String)System.getenv().get("EC2_INSTANCE_ID")
String stackName = (String)System.getenv().get("STACK_NAME")
+
+String moreMetaData = ""
+
+if (args.size() == 1 ) {
+ moreMetaData = args[0]
+}
+
+
def creds = new BasicAWSCredentials(accessKey, secretKey)
def ec2Client = new AmazonEC2Client(creds)
@@ -39,7 +47,7 @@ def resources = new ArrayList()
resources.add(instanceId)
def tags = new ArrayList()
-def tag = "${stackName}-${type}-${instanceId}"
+def tag = "${stackName}-${type}-${instanceId}${moreMetaData}"
tags.add(new Tag("Name", tag))
ec2Client.createTags(new CreateTagsRequest(resources, tags))