[Swift-commit] r2984 - in trunk: . bin docs

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-06-30 07:33:59 -0500 (Tue, 30 Jun 2009)
New Revision: 2984

Modified:
   trunk/CHANGES.txt
   trunk/bin/swift-osg-ress-site-catalog
   trunk/docs/userguide.xml
Log:
New parameter -condor-g for swift-osg-ress-site-catalog which causes
sites files to be generate which will use a local condor-g installation
instead of making direct GRAM submissions.

Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt	2009-06-30 11:38:26 UTC (rev 2983)
+++ trunk/CHANGES.txt	2009-06-30 12:33:59 UTC (rev 2984)
@@ -1,3 +1,8 @@
+(06/30/09)
+*** New parameter -condor-g for swift-osg-ress-site-catalog which causes
+    sites files to be generate which will use a local condor-g installation
+    instead of making direct GRAM submissions.
+
 (06/25/09)
 *** 'global' keyword to allow top level declarations to be visible in all
     scopes.

Modified: trunk/bin/swift-osg-ress-site-catalog
===================================================================
--- trunk/bin/swift-osg-ress-site-catalog	2009-06-30 11:38:26 UTC (rev 2983)
+++ trunk/bin/swift-osg-ress-site-catalog	2009-06-30 12:33:59 UTC (rev 2984)
@@ -10,6 +10,7 @@
 my $opt_vo = 'engage';
 my $opt_engage_verified = 0;
 my $opt_gt4 = 0;
+my $opt_condorg = 0;
 my $opt_out = '&STDOUT';
 
 Getopt::Long::Configure('bundling');
@@ -18,6 +19,7 @@
     "vo=s"                   => \$opt_vo,
     "engage-verified"        => \$opt_engage_verified,
     "gt4"                    => \$opt_gt4,
+    "condor-g"               => \$opt_condorg,
     "out=s"                  => \$opt_out,
 ) or pod2usage(1);
 
@@ -94,7 +96,15 @@
     print FH "  <!-- $sitename -->\n";
     print FH "  <pool handle=\"$sitename\" >\n";
     print FH "    <gridftp  url=\"gsiftp://$host/\" />\n";
-    if ($opt_gt4) {
+    if ($opt_condorg) {
+        print FH "    <execution provider=\"condor\" />\n";
+        print FH "    <profile namespace=\"globus\" key=\"jobType\">grid</profile>\n";
+        if($opt_gt4) {
+            die("swift-osg-ress-site-catalog cannot generate Condor-G + GRAM4 sites files");
+        }
+        print FH "    <profile namespace=\"globus\" key=\"gridResource\">gt2 $contact</profile>\n";
+    }
+    elsif ($opt_gt4) {
         print FH "    <execution provider=\"gt4\" jobmanager=\"$jm\" url=\"$host:9443\" />\n";
     }
     else {
@@ -143,6 +153,11 @@
 
 Write to [filename] instead of stdout
 
+=item B<--condor-g>
+
+Generates sites files which will submit jobs using a local Condor-G
+installation rather than through direct GRAM2 submission.
+
 =back
 
 =head1 DESCRIPTION

Modified: trunk/docs/userguide.xml
===================================================================
--- trunk/docs/userguide.xml	2009-06-30 11:38:26 UTC (rev 2983)
+++ trunk/docs/userguide.xml	2009-06-30 12:33:59 UTC (rev 2984)
@@ -1564,6 +1564,16 @@
 <para>Write to [filename] instead of stdout</para>
 				</listitem>
 			</varlistentry>
+
+			<varlistentry><term>--condor-g</term>
+				<listitem>
+<para>Generates sites files which will submit jobs using a local Condor-G
+installation rather than through direct GRAM2 submission.</para>
+				</listitem>
+			</varlistentry>
+
+
+
 			</variablelist>