[Swift-commit] r7431 - branches/release-0.95/etc

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-13 15:41:41 -0600 (Fri, 13 Dec 2013)
New Revision: 7431

Removed:
   branches/release-0.95/etc/coaster-service.conf
Modified:
   branches/release-0.95/etc/swift.properties
Log:


Deleted: branches/release-0.95/etc/coaster-service.conf
===================================================================
--- branches/release-0.95/etc/coaster-service.conf	2013-12-13 21:35:59 UTC (rev 7430)
+++ branches/release-0.95/etc/coaster-service.conf	2013-12-13 21:41:41 UTC (rev 7431)
@@ -1,52 +0,0 @@
-# Keep all interesting settings in one place
-# User should modify this to fit environment
-
-# Location of SWIFT. If empty, PATH is searched
-export SWIFT=
-
-# Where to copy worker.pl on the remote machine for sites.xml
-export WORKER_WORK=$HOME/swiftwork
-
-# How to launch workers: local, ssh, cobalt, or futuregrid
-export WORKER_MODE=ssh
-
-# SSH hosts to start workers on (ssh mode only)
-export WORKER_HOSTS="host1 host2 host3"
-
-# Do all the worker nodes you're using have a shared filesystem? (yes/no)
-export SHARED_FILESYSTEM=yes
-
-# Username to use on worker nodes
-export WORKER_USERNAME=$USER
-
-# Enable SSH tunneling? (yes/no)
-export SSH_TUNNELING=no
-
-# Directory to keep log files, relative to working directory when launching start-coaster-service
-export LOG_DIR=logs
-
-# Manually define ports. If not specified, an available port will be used
-export LOCAL_PORT=
-export SERVICE_PORT=
-
-# start-coaster-service tries to automatically detect the IP address of this system. Specify here if you have multiple network interfaces
-export IPADDR=
-
-# Location of the swift-vm-boot scripts
-export SWIFTVMBOOT_DIR=$HOME/swift-vm-boot
-
-export JOBS_PER_NODE=4
-export JOB_THROTTLE=1000
-
-# Setting for WORKER_INIT_CMD
-export WORKER_ENVIRONMENT=
-
-# Kernel profile for cobalt jobs
-export KERNEL=zeptoos
-
-# Swift information for creating sites.xml
-export PROJECT=
-export WORK=$HOME/swiftwork
-export QUEUE=default
-export MAXTIME=15
-export NODES=64

Modified: branches/release-0.95/etc/swift.properties
===================================================================
--- branches/release-0.95/etc/swift.properties	2013-12-13 21:35:59 UTC (rev 7430)
+++ branches/release-0.95/etc/swift.properties	2013-12-13 21:41:41 UTC (rev 7431)
@@ -386,3 +386,12 @@
 #
 # Default: true
 #
+
+# Add a default definition for 'local' site
+site.local {
+   jobManager=local
+   tasksPerWorker=1
+   filesystem=local
+   workdir=$RUNDIRECTORY
+   taskThrottle=1
+}