[Swift-commit] r5421 - branches/release-0.93/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-12-15 14:13:42 -0600 (Thu, 15 Dec 2011)
New Revision: 5421

Modified:
   branches/release-0.93/bin/start-coaster-service
Log:
A few ec2 fixes


Modified: branches/release-0.93/bin/start-coaster-service
===================================================================
--- branches/release-0.93/bin/start-coaster-service	2011-12-14 22:04:16 UTC (rev 5420)
+++ branches/release-0.93/bin/start-coaster-service	2011-12-15 20:13:42 UTC (rev 5421)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # crash: Report a problem and exit
 crash()
@@ -117,7 +117,7 @@
    export EC2_CERT="$EC2_CERTFILE"
 
    echo Creating instance..
-   $SWIFTVMBOOT_DIR/bin/ec2-run-instances "$EC2_AMI" -t "$EC2_INSTANCE_TYPE" -n "$EC2_NODES" -k "$EC2_KEYPAIR"
+   $SWIFTVMBOOT_DIR/bin/ec2-run-instances "$EC2_AMI" -t "$EC2_INSTANCE_TYPE" -n "$EC2_NODES" -K "$EC2_KEYFILE" -C "$EC2_CERT"
    SWIFTVM_INSTANCES=$( $SWIFTVMBOOT_DIR/bin/ec2-describe-instances | grep INSTANCE | grep -v terminated |awk '{print $2}' )
    echo $SWIFTVM_INSTANCES >> $HOME/.swift/.swiftvm_instances
    echo Waiting for nodes to boot..
@@ -126,7 +126,7 @@
    while /bin/true
    do
       SWIFTVM_INSTANCES_AS_STRING=$( echo $SWIFTVM_INSTANCES | tr "\\n" " ")
-      STATUS_LIST=$( $SWIFTVMBOOT_DIR/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $6}' |sort -u )
+      STATUS_LIST=$( $SWIFTVMBOOT_DIR/bin/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $6}' |sort -u )
       if [ "$STATUS_LIST" == "running" ]; then
          break
       fi
@@ -136,7 +136,7 @@
    # There is some delay between when the machines are 'running', and when system utilities like sshd are started
    sleep 30
 
-   WORKER_HOSTS=$( $SWIFTVMBOOT_DIR/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $4}' )
+   WORKER_HOSTS=$( $SWIFTVMBOOT_DIR/bin/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $4}' )
 
    if [ -f "$HOME/.swift/.machines" ]; then
       rm $HOME/.swift/.machines