|
 |
b3fe293 |
diff --git a/src/condor_gridmanager/gahp-client.cpp b/src/condor_gridmanager/gahp-client.cpp
|
|
|
b3fe293 |
index 48c6b15..b0a44d8 100644
|
|
|
b3fe293 |
--- a/src/condor_gridmanager/gahp-client.cpp
|
|
|
b3fe293 |
+++ b/src/condor_gridmanager/gahp-client.cpp
|
|
|
b3fe293 |
@@ -703,6 +703,16 @@ GahpServer::Startup()
|
|
|
b3fe293 |
free( tmp_char );
|
|
|
b3fe293 |
}
|
|
|
b3fe293 |
|
|
|
b3fe293 |
+ // GLOBUS_LOCATION needs to be set for the blahp; otherwise, it defaults to /opt/globus,
|
|
|
b3fe293 |
+ // which is likely never correct
|
|
|
b3fe293 |
+ tmp_char = param("GLOBUS_LOCATION");
|
|
|
b3fe293 |
+ if ( tmp_char ) {
|
|
|
b3fe293 |
+ newenv.SetEnv( "GLOBUS_LOCATION", tmp_char );
|
|
|
b3fe293 |
+ free( tmp_char );
|
|
|
b3fe293 |
+ } else if (getenv("GLOBUS_LOCATION") == NULL) {
|
|
|
b3fe293 |
+ newenv.SetEnv( "GLOBUS_LOCATION", "/usr" );
|
|
|
b3fe293 |
+ }
|
|
|
b3fe293 |
+
|
|
|
b3fe293 |
// For amazon ec2 ca authentication
|
|
|
b3fe293 |
tmp_char = param("SOAP_SSL_CA_FILE");
|
|
|
b3fe293 |
if( tmp_char ) {
|
|
|
b3fe293 |
diff --git a/src/condor_gridmanager/infnbatchjob.cpp b/src/condor_gridmanager/infnbatchjob.cpp
|
|
|
b3fe293 |
index b76bc4f..f6751a1 100644
|
|
|
b3fe293 |
--- a/src/condor_gridmanager/infnbatchjob.cpp
|
|
|
b3fe293 |
+++ b/src/condor_gridmanager/infnbatchjob.cpp
|
|
|
b3fe293 |
@@ -224,7 +224,7 @@ INFNBatchJob::INFNBatchJob( ClassAd *classad )
|
|
|
b3fe293 |
free( gahp_path );
|
|
|
b3fe293 |
|
|
|
b3fe293 |
myResource = INFNBatchResource::FindOrCreateResource( batchType,
|
|
|
b3fe293 |
- gahp_args.GetArg(0) );
|
|
|
b3fe293 |
+ (gahp_args.Count() > 0) ? gahp_args.GetArg(0) : "localhost" );
|
|
|
b3fe293 |
myResource->RegisterJob( this );
|
|
|
b3fe293 |
if ( remoteJobId ) {
|
|
|
b3fe293 |
myResource->AlreadySubmitted( this );
|