[Swift-commit] r4571 - in trunk: bin etc

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-06-06 14:15:11 -0500 (Mon, 06 Jun 2011)
New Revision: 4571

Modified:
   trunk/bin/start-coaster-service
   trunk/etc/coaster-service.conf
Log:
Modified start-coaster-service to only create config file when needed
Better defaults on coaster-service.conf


Modified: trunk/bin/start-coaster-service
===================================================================
--- trunk/bin/start-coaster-service	2011-06-06 18:26:29 UTC (rev 4570)
+++ trunk/bin/start-coaster-service	2011-06-06 19:15:11 UTC (rev 4571)
@@ -227,17 +227,16 @@
 
 # Generate sites.xml
 export EXECUTION_URL="http://$IPADDR:$SERVICE_PORT"
-echo Generating sites.xml..
+echo Generating sites.xml
 gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml 
 
 # Generate config file
 if [ $SHARED_FILESYSTEM == "no" ]; then
+echo Generating config file
 cat > $RUN_DIR/cf << EOF
 use.provider.staging=true
 wrapperlog.always.transfer=false
 execution.retries=0
 provider.staging.pin.swiftfiles=false
 EOF
-else
-   echo > $RUN_DIR/cf
 fi

Modified: trunk/etc/coaster-service.conf
===================================================================
--- trunk/etc/coaster-service.conf	2011-06-06 18:26:29 UTC (rev 4570)
+++ trunk/etc/coaster-service.conf	2011-06-06 19:15:11 UTC (rev 4571)
@@ -17,7 +17,7 @@
 export WORKER_HOSTS="host1 host2 host3"
 
 # Do all the worker nodes you're using have a shared filesystem? (yes/no)
-export SHARED_FILESYSTEM=no
+export SHARED_FILESYSTEM=yes
 
 # Username to use on worker nodes
 export WORKER_USERNAME=$USER