[Swift-commit] r6795 - SwiftTutorials/ATPESC_2013-08-06/cloud

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-08-06 16:16:16 -0500 (Tue, 06 Aug 2013)
New Revision: 6795

Modified:
   SwiftTutorials/ATPESC_2013-08-06/cloud/README
   SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh
   SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt
   SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data
Log:
updated addcloud and README

Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/README
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/README	2013-08-06 20:29:27 UTC (rev 6794)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/README	2013-08-06 21:16:16 UTC (rev 6795)
@@ -15,7 +15,7 @@
 - Add the cloud resources to existing non-cloud examples:
    ./addcloud.sh <dir> #where dir is a tutorial script directory
    e.g.
-   ./addcloud.sh ../p01 #will add cloud resources to p01 sites pool 
+   ./addcloud.sh ../p01 #will create a new site pool "both.xml"
 
 - Finally, to clean up the log files, kill agent and shutdown the coaster service:
     ./cleanme

Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh	2013-08-06 20:29:27 UTC (rev 6794)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh	2013-08-06 21:16:16 UTC (rev 6795)
@@ -17,6 +17,11 @@
 
 cloudpool=$(cat poolentry.xml)
 
-sed -i "/<\/config>/i\
-$(echo $cloudpool | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g')" $1/sites.xml
+#escape some characters and add pool entry to sites file
+sed "/<\/config>/i\
+$(echo $cloudpool | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g')" $1/sites.xml > $1/both.xml
 
+echo "Done."
+echo "To run with the new setup, cd into $1 and use '-sites.file both.xml' option with Swift commandline"
+echo "eg. swift <p<xx>.swift> -sites.file both.xml"
+

Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt	2013-08-06 20:29:27 UTC (rev 6794)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt	2013-08-06 21:16:16 UTC (rev 6795)
@@ -1,3 +1,3 @@
-54.214.98.22
-54.212.124.129
-54.218.221.157
+54.212.170.216
+54.244.171.51
+54.212.140.138

Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml	2013-08-06 20:29:27 UTC (rev 6794)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml	2013-08-06 21:16:16 UTC (rev 6795)
@@ -1,7 +1,7 @@
 <config>
   <pool handle="persistent-coasters">
     <execution provider="coaster-persistent"
-               url="http://localhost:44120"
+               url="http://localhost:43261"
                jobmanager="local:local"/>
     <profile namespace="globus" key="workerManager">passive</profile>
     <profile namespace="globus" key="jobsPerNode">8</profile>

Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data	2013-08-06 20:29:27 UTC (rev 6794)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data	2013-08-06 21:16:16 UTC (rev 6795)
@@ -85,3 +85,9 @@
 persistent-coasters cat /bin/cat null null null
 persistent-coasters bash /bin/bash null null null
 persistent-coasters echo /bin/echo null null null
+persistent-coasters cat /bin/cat null null null
+persistent-coasters bash /bin/bash null null null
+persistent-coasters echo /bin/echo null null null
+persistent-coasters cat /bin/cat null null null
+persistent-coasters bash /bin/bash null null null
+persistent-coasters echo /bin/echo null null null