Skip to content

Commit a551437

Browse files
committed
fix: get CAs location with getCAsLocation() utility
1 parent ec2f013 commit a551437

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
6363
from DIRAC.Core.Utilities.File import makeGuid
6464
from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import writeToTokenFile
65-
65+
from DIRAC.Core.Security.Locations import getCAsLocation
6666
from DIRAC.Resources.Computing.BatchSystems.Condor import parseCondorStatus
6767

6868
MANDATORY_PARAMETERS = ["Queue"]
@@ -272,8 +272,9 @@ def _executeCondorCommand(self, cmd, keepTokenFile=False):
272272
htcEnv = {
273273
"_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "SCITOKENS",
274274
"_CONDOR_SCITOKENS_FILE": self.tokenFile.name,
275-
"_CONDOR_AUTH_SSL_CLIENT_CADIR": os.environ.get("X509_CERT_DIR", "/etc/grid-security/certificates"),
276275
}
276+
if cas := getCAsLocation():
277+
htcEnv["_CONDOR_AUTH_SSL_CLIENT_CADIR"] = cas
277278
else:
278279
htcEnv = {"_CONDOR_SEC_CLIENT_AUTHENTICATION_METHODS": "GSI"}
279280

0 commit comments

Comments
 (0)