[Swift-commit] r7634 - SwiftApps/cloud

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-03-05 18:36:18 -0600 (Wed, 05 Mar 2014)
New Revision: 7634

Modified:
   SwiftApps/cloud/addnodes
Log:
environment vars

Modified: SwiftApps/cloud/addnodes
===================================================================
--- SwiftApps/cloud/addnodes	2014-03-05 21:53:09 UTC (rev 7633)
+++ SwiftApps/cloud/addnodes	2014-03-06 00:36:18 UTC (rev 7634)
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-#set -x
+set -x
 
 #env vars needed from start-coaster-service
-WORKER_USERNAME="root" #FIXME
-LOCALPORT="50001"
-WORKERURL="http://140.221.8.75:50001"
-SSH_TUNNELING="yes"
-WORKER_LOCATION="/root"
-WORKER_LOGGING_LEVEL="NONE"
-WORKER_LOG_DIR="/root/workerlog"
-LOG="/tmp/worker.log"
-PID_FILE="/tmp/worker.pid"
+#WORKER_USERNAME="root" #FIXME
+#LOCALPORT="50001"
+#WORKERURL="http://140.221.8.75:50001"
+#SSH_TUNNELING="yes"
+#WORKER_LOCATION="/root"
+#WORKER_LOGGING_LEVEL="NONE"
+#WORKER_LOG_DIR="/root/workerlog"
+#LOG="/tmp/worker.log"
+#PID_FILE="/tmp/worker.pid"
 
 # Import settings
 if [ -f "coaster-service.conf" ]; then
@@ -67,9 +67,9 @@
 addbynum (){
     echo "$1"
     #ec2-run-instance -k <key-name> -n 1 <ami-id>
-    runinst=$(ec2-run-instance -k "$KEYPAIR" -g all -n "$1" "$AMI")
+    runinst=$(ec2-run-instance -k "$KEYPAIR" -g all -n "$1" --instance-type t1.micro "$AMI")
     echo "Waiting for instances to start"
-    sleep 45
+    sleep 90
     for i in $(echo $runinst | grep -o '\bi-........\b'); do
         ip=$(ec2din $i | grep 'running' | awk '{print $15}')
         start-worker-ssh $ip