[Swift-commit] r6162 - in trunk: bin etc/sites

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-01-22 13:11:26 -0600 (Tue, 22 Jan 2013)
New Revision: 6162

Modified:
   trunk/bin/start-coaster-service
   trunk/etc/sites/persistent-coasters
Log:
Use $GLOBUS_HOSTNAME before trying ifconfig
Ignore junk from ifconfig
Fix for persistent-coaster template for new gensites


Modified: trunk/bin/start-coaster-service
===================================================================
--- trunk/bin/start-coaster-service	2013-01-22 17:53:21 UTC (rev 6161)
+++ trunk/bin/start-coaster-service	2013-01-22 19:11:26 UTC (rev 6162)
@@ -428,8 +428,10 @@
 if [ -z "$IPADDR" ]; then
    if [ "$SSH_TUNNELING" == "yes" ]; then
       IPADDR=localhost
+   elif [ -n "$GLOBUS_HOSTNAME" ]; then
+      IPADDR=$GLOBUS_HOSTNAME
    elif [ -x "/sbin/ifconfig" ]; then
-      IPADDR=$( /sbin/ifconfig | grep 'inet addr' | grep -v 127.0.0.1 | cut -d ':' -f 2 | awk '{print $1}' |head -1)
+      IPADDR=$( /sbin/ifconfig 2>/dev/null | grep 'inet addr' | grep -v 127.0.0.1 | cut -d ':' -f 2 | awk '{print $1}' |head -1)
    else
       crash "Unable to determine IP address of system. Please add to coaster-service.conf"
    fi

Modified: trunk/etc/sites/persistent-coasters
===================================================================
--- trunk/etc/sites/persistent-coasters	2013-01-22 17:53:21 UTC (rev 6161)
+++ trunk/etc/sites/persistent-coasters	2013-01-22 19:11:26 UTC (rev 6162)
@@ -1,11 +1,11 @@
 <config>
   <pool handle="persistent-coasters">
     <execution provider="coaster-persistent"
-               url="_EXECUTION_URL_"
+               url="_EXECUTIONURL_"
                jobmanager="local:local"/>
     <profile namespace="globus" key="workerManager">passive</profile>
-    <profile namespace="globus" key="jobsPerNode">_JOBS_PER_NODE_</profile>
-    <profile key="jobThrottle" namespace="karajan">_JOB_THROTTLE_</profile>
+    <profile namespace="globus" key="jobsPerNode">_JOBSPERNODE_</profile>
+    <profile key="jobThrottle" namespace="karajan">_JOBTHROTTLE_</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local" url="none" />
     <workdirectory>_WORK_</workdirectory>