tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1053166 - in /tuscany/sca-cpp/trunk/ubuntu: uec2-bin-all-image uec2-conf uec2-dev-all-image uec2-ssh uec2-start uec2-status uec2-stop
Date Mon, 27 Dec 2010 19:54:32 GMT
Author: jsdelfino
Date: Mon Dec 27 19:54:31 2010
New Revision: 1053166

URL: http://svn.apache.org/viewvc?rev=1053166&view=rev
Log:
Improve EC2 setup scripts. Remove dependency on external environment variables.

Modified:
    tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image
    tuscany/sca-cpp/trunk/ubuntu/uec2-conf
    tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image
    tuscany/sca-cpp/trunk/ubuntu/uec2-ssh
    tuscany/sca-cpp/trunk/ubuntu/uec2-start
    tuscany/sca-cpp/trunk/ubuntu/uec2-status
    tuscany/sca-cpp/trunk/ubuntu/uec2-stop

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image Mon Dec 27 19:54:31 2010
@@ -19,5 +19,5 @@
 host=$1
 
 # Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image;
chmod 700 ./ubuntu-bin-all-image; ./ubuntu-bin-all-image"
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image;
chmod 700 ./ubuntu-bin-all-image; ./ubuntu-bin-all-image"
 

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-conf?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-conf (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-conf Mon Dec 27 19:54:31 2010
@@ -17,7 +17,7 @@
 
 # Configure EC2 for use with Tuscany SCA
 here=`readlink -f $0`; here=`dirname $here`
-$here/uec2-setenv
+. $here/uec2-setenv
 
 # Display commands as they are executed
 set -x
@@ -27,9 +27,9 @@ set -x
 sudo apt-get install ec2-api-tools
 
 # Create an EC2 SSH keypair if necessary
-if [ ! -f $HOME/.ec2/ec2-tuscany-keypair.pem ]; then
-    ec2-add-keypair ec2-tuscany-keypair --region us-west-1 > $HOME/.ec2/ec2-tuscany-keypair.pem
-    chmod 600 $HOME/.ec2/ec2-tuscany-keypair.pem
+if [ ! -f $HOME/.ec2/ec2-keypair.pem ]; then
+    ec2-add-keypair ec2-keypair --region us-west-1 > $HOME/.ec2/ec2-keypair.pem
+    chmod 600 $HOME/.ec2/ec2-keypair.pem
 fi
 
 # Authorize SSH, HTTP and HTTPS access to EC2 instances

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image Mon Dec 27 19:54:31 2010
@@ -19,5 +19,5 @@
 host=$1
 
 # Download and execute Tuscany SCA install script
-ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image;
chmod 700 ./ubuntu-dev-all-image; ./ubuntu-dev-all-image"
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image;
chmod 700 ./ubuntu-dev-all-image; ./ubuntu-dev-all-image"
 

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-ssh
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-ssh?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-ssh (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-ssh Mon Dec 27 19:54:31 2010
@@ -17,5 +17,5 @@
 
 # SSH to an EC2 instance
 host=$1
-ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host
+ssh -i $HOME/.ec2/ec2-keypair.pem ubuntu@$host
 

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-start?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-start (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-start Mon Dec 27 19:54:31 2010
@@ -18,7 +18,7 @@
 # Start an Ubuntu 10.10 64-bit EC2 instance for use with Tuscany
 
 here=`readlink -f $0`; here=`dirname $here`
-$here/uec2-setenv
+. $here/uec2-setenv
 
 # Here are the AMI IDs you can use in the different EC2 regions:
 # Ubuntu 10.10 64-bit (elastic block storage)
@@ -32,7 +32,7 @@ $here/uec2-setenv
 # t1.micro
 # m1.large
 
-#ec2-run-instances "ami-ca1f4f8f" -t m1.large -k ec2-tuscany-keypair --region us-west-1
-#ec2-run-instances "ami-ca1f4f8f" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
-ec2-run-instances "ami-ca1f4f8f" -t t1.micro -k ec2-tuscany-keypair --region us-west-1
+#ec2-run-instances "ami-ca1f4f8f" -t m1.large -k ec2-keypair --region us-west-1
+#ec2-run-instances "ami-ca1f4f8f" -t t1.micro -k ec2-keypair --region us-west-1
+ec2-run-instances "ami-ca1f4f8f" -t t1.micro -k ec2-keypair --region us-west-1
 

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-status
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-status?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-status (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-status Mon Dec 27 19:54:31 2010
@@ -17,7 +17,7 @@
 
 # Display the status of EC2 instances
 here=`readlink -f $0`; here=`dirname $here`
-$here/uec2-setenv
+. $here/uec2-setenv
 
 ec2-describe-instances --region us-west-1
 

Modified: tuscany/sca-cpp/trunk/ubuntu/uec2-stop
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-stop?rev=1053166&r1=1053165&r2=1053166&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/uec2-stop (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-stop Mon Dec 27 19:54:31 2010
@@ -18,7 +18,7 @@
 # Terminate an EC2 instance
 instance=$1
 here=`readlink -f $0`; here=`dirname $here`
-$here/uec2-setenv
+. $here/uec2-setenv
 
 ec2-terminate-instances $instance --region us-west-1
 



Mime
View raw message