[Swift-commit] r5331 - in branches/release-0.93/bin: . vm/ec2

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-12-02 10:53:04 -0600 (Fri, 02 Dec 2011)
New Revision: 5331

Modified:
   branches/release-0.93/bin/start-coaster-service
   branches/release-0.93/bin/vm/ec2/ec2.template.conf
Log:
Template fix and better integration


Modified: branches/release-0.93/bin/start-coaster-service
===================================================================
--- branches/release-0.93/bin/start-coaster-service	2011-12-02 16:38:40 UTC (rev 5330)
+++ branches/release-0.93/bin/start-coaster-service	2011-12-02 16:53:04 UTC (rev 5331)
@@ -14,8 +14,11 @@
    PORT=$1
    EXECUTION_URL=http://localhost:$PORT
 
-   if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/bootit.sh" ]; then
-      crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
+   if [ ! -d "$SWIFTVMBOOT_DIR" ]; then
+      SWIFTVMBOOT_DIR=$SWIFT_BIN/vm/futuregrid
+      if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/bootit.sh" ]; then
+         crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
+      fi
    fi
 
    echo Starting virtual machines.. please wait
@@ -53,8 +56,12 @@
 {
    PORT=$1
    EXECUTION_URL=http://localhost:$PORT
-   if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/gp-instance-create" ]; then
-      crash "SWIFTVMBOT_DIR incorrectly defined in coaster-service.conf"
+   
+   if [ ! -d "$SWIFTVMBOOT_DIR" ]; then
+      SWIFTVMBOOT_DIR=$SWIFT_BIN/vm/ec2
+      if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/gp-instance-create" ]; then
+         crash "SWIFTVMBOT_DIR incorrectly defined in coaster-service.conf"
+      fi
    fi
 
    SEDFILE=`mktemp`

Modified: branches/release-0.93/bin/vm/ec2/ec2.template.conf
===================================================================
--- branches/release-0.93/bin/vm/ec2/ec2.template.conf	2011-12-02 16:38:40 UTC (rev 5330)
+++ branches/release-0.93/bin/vm/ec2/ec2.template.conf	2011-12-02 16:53:04 UTC (rev 5331)
@@ -5,7 +5,7 @@
 [domain-swift]
 users: swift
 nfs-nis: yes
-lrm: none
+lrm: condor
 cluster-nodes: _CLUSTER-NODES_
 
 [ec2]