Skip to content

Commit f9e0bda

Browse files
committed
fix: actually using CVMFS for creating the pilot wrapper
1 parent 200ec47 commit f9e0bda

File tree

2 files changed

+3
-1
lines changed
  • docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots
  • src/DIRAC/WorkloadManagementSystem/Agent

2 files changed

+3
-1
lines changed

docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Inside this section, you should define the following options, and give them a me
8888
Installation = mycfg.cfg # For an optional configuration file, used by the installation script.
8989
PreInstalledEnv = /cvmfs/some/where/specific/bashrc # A specific rc file to source for setting up DIRAC
9090
PreInstalledEnvPrefix = /cvmfs/some/where/ # Location where DIRAC installations can be found. The Pilot will then try and find the following: /cvmfs/some/where/{Version/}{platform}/diracosrc
91-
CVMFS_locations = /cvmfs/some/ # Comma-separated list of locations where DIRAC installations, CAs and CRLs can be found. The Pilot will then try and find the following: /cvmfs/some/{releaseProject}dirac/{Version/}{platform}/diracosrc and /cvmfs/some/etc/grid-security/certificates
91+
CVMFS_locations = /cvmfs/some/ # Comma-separated list of locations where DIRAC installations, CAs and CRLs can be found. The Pilot will then try and find the following: /cvmfs/some/{releaseProject}dirac/{Version/}{platform}/diracosrc and /cvmfs/some/etc/grid-security/certificates. Those same locations will also be used by the Pilot Wrapper to try and find the pilot files in /cvmfs/some/{releaseProject}dirac/pilot/.
9292
# For the Matcher
9393
CheckVersion = False # True by default, if false any version would be accepted at matching level (this is a check done by the WorkloadManagementSystem/Matcher service).
9494

src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,12 +1108,14 @@ def _writePilotScript(self, workingDirectory, pilotOptions, proxy=None, pilotExe
11081108
self.log.exception("Exception during pilot modules files compression", lException=be)
11091109

11101110
location = Operations().getValue("Pilot/pilotFileServer", "")
1111+
CVMFS_locations = Operations().getValue("Pilot/CVMFS_locations")
11111112
localPilot = pilotWrapperScript(
11121113
pilotFilesCompressedEncodedDict=pilotFilesCompressedEncodedDict,
11131114
pilotOptions=pilotOptions,
11141115
pilotExecDir=pilotExecDir,
11151116
envVariables=envVariables,
11161117
location=location,
1118+
CVMFS_locations=CVMFS_locations,
11171119
)
11181120

11191121
return _writePilotWrapperFile(workingDirectory=workingDirectory, localPilot=localPilot)

0 commit comments

Comments
 (0)