Author: apurtell
Date: Mon Nov 16 20:00:57 2009
New Revision: 880937
URL: http://svn.apache.org/viewvc?rev=880937&view=rev
Log:
HBASE-1961 HBase EC2 scripts; tighten up configuration a bit and document
configuration required in hbase-ec2-env.sh
Modified:
hadoop/hbase/trunk/src/contrib/ec2/README.txt
hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image
hadoop/hbase/trunk/src/contrib/ec2/bin/hbase-ec2-env.sh
Modified: hadoop/hbase/trunk/src/contrib/ec2/README.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/README.txt?rev=880937&r1=880936&r2=880937&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/README.txt (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/README.txt Mon Nov 16 20:00:57 2009
@@ -15,3 +15,22 @@
http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88
installed and on the path. For Ubuntu, "apt-get install ec2-ami-tools
ec2-api-tools".
+
+The hbase-ec2-env.sh script requires some configuration:
+
+- Fill in AWS_ACCOUNT_ID with your EC2 account number
+
+- Fill in AWS_ACCESS_KEY_ID with your EC2 access key
+
+- Fill in AWS_SECRET_ACCESS_KEY with your EC2 secret access key
+
+- Fill in KEY_NAME with the SSH keypair you will use
+
+- Fill in EC2_PRIVATE_KEY with the location of your AWS private key file --
+ must begin with 'pk' and end with '.pem'
+
+- Fill in EC2_CERT with the location of your AWS certificate -- must begin
+ with 'cert' and end with '.pem'
+
+- Make sure the private part of your AWS SSH keypair exists in the same
+ directory as EC2_PRIVATE_KEY with the name id_rsa_${KEYNAME}
Modified: hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image?rev=880937&r1=880936&r2=880937&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image Mon Nov 16
20:00:57 2009
@@ -65,8 +65,8 @@
scp $SSH_OPTS "$bin"/image/ec2-run-user-data "r...@$hostname:/etc/init.d"
# Copy private key and certificate (for bundling image)
-scp $SSH_OPTS $EC2_KEYDIR/pk*.pem "r...@$hostname:/mnt"
-scp $SSH_OPTS $EC2_KEYDIR/cert*.pem "r...@$hostname:/mnt"
+scp $SSH_OPTS $EC2_PRIVATE_KEY "r...@$hostname:/mnt"
+scp $SSH_OPTS $EC2_CERT "r...@$hostname:/mnt"
# Connect to it
ssh $SSH_OPTS "r...@$hostname" "sh -c \"INSTANCE_TYPE=$INSTANCE_TYPE
/mnt/create-hbase-image-remote\""
Modified: hadoop/hbase/trunk/src/contrib/ec2/bin/hbase-ec2-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/bin/hbase-ec2-env.sh?rev=880937&r1=880936&r2=880937&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/bin/hbase-ec2-env.sh (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/bin/hbase-ec2-env.sh Mon Nov 16 20:00:57
2009
@@ -24,6 +24,12 @@
# Your Amazon AWS secret access key.
AWS_SECRET_ACCESS_KEY=
+# Your AWS private key file -- must begin with 'pk' and end with '.pem'
+EC2_PRIVATE_KEY=
+
+# Your AWS certificate file -- must begin with 'cert' and end with '.pem'
+EC2_CERT=
+
# Location of EC2 keys.
# The default setting is probably OK if you set up EC2 following the Amazon
Getting Started guide.
EC2_KEYDIR=`dirname "$EC2_PRIVATE_KEY"`