[Swift-commit] r7731 - SwiftApps/cloud

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-03-19 12:24:03 -0500 (Wed, 19 Mar 2014)
New Revision: 7731

Modified:
   SwiftApps/cloud/addnodes
   SwiftApps/cloud/apps
   SwiftApps/cloud/remnodes
Log:
new api

Modified: SwiftApps/cloud/addnodes
===================================================================
--- SwiftApps/cloud/addnodes	2014-03-19 16:52:09 UTC (rev 7730)
+++ SwiftApps/cloud/addnodes	2014-03-19 17:24:03 UTC (rev 7731)
@@ -67,7 +67,7 @@
     sleep 60
     for i in $(echo $runinst | grep -o '\bi-........\b'); do
         #ip=$(ec2din $i | grep 'running' | awk '{print $15}')
-        ip=$(ec2din --show-empty-fields | grep running | awk '{print $17}')
+        ip=$(ec2din --show-empty-fields $i | grep running | awk '{print $17}')
         start_worker_ssh $ip 
     done
 }

Modified: SwiftApps/cloud/apps
===================================================================
--- SwiftApps/cloud/apps	2014-03-19 16:52:09 UTC (rev 7730)
+++ SwiftApps/cloud/apps	2014-03-19 17:24:03 UTC (rev 7731)
@@ -1,7 +1,3 @@
 persistent-coasters cat /bin/cat
 persistent-coasters bash /bin/bash
 persistent-coasters echo /bin/echo
-
-persistent-coasters cat /bin/cat 
-persistent-coasters bash /bin/bash 
-persistent-coasters echo /bin/echo 

Modified: SwiftApps/cloud/remnodes
===================================================================
--- SwiftApps/cloud/remnodes	2014-03-19 16:52:09 UTC (rev 7730)
+++ SwiftApps/cloud/remnodes	2014-03-19 17:24:03 UTC (rev 7731)
@@ -9,7 +9,7 @@
 rem_instance() {
       MACHINE=$1
       #ec2din | grep 54.243.24.154 | awk '{print $2}'
-      instanceid=$(ec2din --show-empty-fields | grep $1 | awk '{print $2}')
+      instanceid=$(ec2din --show-empty-fields | grep $MACHINE | awk '{print $2}')
       ec2kill $instanceid
       # Connect directly
    return 0
@@ -26,9 +26,9 @@
     #ec2-run-instance -k <key-name> -n 1 -g <groupname> --instance-type <type> <ami-id>
     for i in $(seq 1 $1); do
         #ip=$(ec2din | grep running | head -1 | awk '{print $15}')
-        ip=$(ec2din --show-empty-fields | grep running | awk '{print $17}')
+        ip=$(ec2din --show-empty-fields | grep -E 'INSTANCE.*running' | head -n 1 | awk '{print $17}')
         rem_instance "${ip}"
-        sleep 15
+        sleep 5
     done
 }