[Swift-commit] r7194 - in SwiftTutorials/swift-cloud-tutorial: . scs

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-10-21 17:55:17 -0500 (Mon, 21 Oct 2013)
New Revision: 7194

Added:
   SwiftTutorials/swift-cloud-tutorial/scs/
   SwiftTutorials/swift-cloud-tutorial/scs/coaster-service.conf
   SwiftTutorials/swift-cloud-tutorial/scs/get_ip_list.sh
Modified:
   SwiftTutorials/swift-cloud-tutorial/setup.sh
Log:
Add scs directory


Added: SwiftTutorials/swift-cloud-tutorial/scs/coaster-service.conf
===================================================================
--- SwiftTutorials/swift-cloud-tutorial/scs/coaster-service.conf	                        (rev 0)
+++ SwiftTutorials/swift-cloud-tutorial/scs/coaster-service.conf	2013-10-21 22:55:17 UTC (rev 7194)
@@ -0,0 +1,10 @@
+export WORKER_LOCATION=/home/ubuntu
+export WORKER_HOSTS="10.1.2.10 10.1.2.11"
+export WORKER_MODE=ssh
+export WORKER_USERNAME=ubuntu
+export IPADDR="10.1.2.3"
+export WORKER_LOG_DIR=/home/ubuntu
+export WORK=/home/ubuntu/work
+export JOBSPERNODE=1
+export JOBTHROTTLE=10
+export SSH_TUNNELING=yes

Added: SwiftTutorials/swift-cloud-tutorial/scs/get_ip_list.sh
===================================================================
--- SwiftTutorials/swift-cloud-tutorial/scs/get_ip_list.sh	                        (rev 0)
+++ SwiftTutorials/swift-cloud-tutorial/scs/get_ip_list.sh	2013-10-21 22:55:17 UTC (rev 7194)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+nova list |grep ACTIVE|awk '{print ( $(NF-1) )}'|cut -d'=' -f2 | sed ':a;N;$!ba;s/\n/ /g'
+


Property changes on: SwiftTutorials/swift-cloud-tutorial/scs/get_ip_list.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/swift-cloud-tutorial/setup.sh
===================================================================
--- SwiftTutorials/swift-cloud-tutorial/setup.sh	2013-10-21 22:51:15 UTC (rev 7193)
+++ SwiftTutorials/swift-cloud-tutorial/setup.sh	2013-10-21 22:55:17 UTC (rev 7194)
@@ -4,28 +4,10 @@
   exit 1
 fi
 
-# Add swift to PATH
-
-TUTSWIFT=/glusterfs/users/swiftlang/dkelly/swift-0.94.1
-PATHSWIFT=$(which swift 2>/dev/null)
-
-if [ _$PATHSWIFT = _$TUTSWIFT/bin/swift ]; then
-  echo using Swift from $TUTSWIFT,already in PATH
-elif [ -x $TUTSWIFT/bin/swift ]; then
-  echo Using Swift from $TUTSWIFT, and adding to PATH
-  PATH=$TUTSWIFT/bin:$PATH
-elif [ _$PATHSWIFT != _ ]; then
-  echo Using $PATHSWIFT from PATH
-else
-  echo ERROR: $TUTSWIFT not found and no swift in PATH. Tutorial will not function.
-#  return
-fi
-
 echo Swift version is $(swift -version)
 rm -f swift.log
 
 # Setting scripts folder to the PATH env var.
-
 TUTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [ _$(which cleanup 2>/dev/null) != _$TUTDIR/bin/cleanup ]; then
@@ -36,7 +18,6 @@
 fi
 
 # Setting .swift files
-
 if [ -e $HOME/.swift/swift.properties ]; then
   saveprop=$(mktemp $HOME/.swift/swift.properties.XXXX)
   echo Saving $HOME/.swift/swift.properties in $saveprop
@@ -67,7 +48,7 @@
 END
 
 # Start coaster-service and generate sites.xml
-cd .scs
+cd scs
 start-coaster-service
 for p in 04 05 06; do
   cp sites.xml ../part${p}/sites.xml