Merge pull request #8037 from atsareg/fix-elastic-job-parameters

[8.0]  Fix getting ES configuration

src/DIRAC/ConfigurationSystem/Client/Utilities.py

@@ -472,9 +472,9 @@ def _getCACerts(cs_path):
             gLogger.debug("Failed to get the configuration parameter: CRT. Using False")
             certs = False
         else:
-            certs = result["Value"]
+            certs = result["Value"].lower() in ("true", "yes", "y", "1")
     else:
-        certs = result["Value"]
+        certs = result["Value"].lower() in ("true", "yes", "y", "1")
     parameters["CRT"] = certs
 
     # If connection is through certificates get the mandatory parameters: ca_certs, client_key, client_cert
@@ -579,9 +579,9 @@ def _getCACerts(cs_path):
             gLogger.debug("Failed to get the configuration parameter: SSL. Assuming SSL is needed")
             ssl = True
         else:
-            ssl = False if result["Value"].lower() in ("false", "no", "n") else True
+            ssl = result["Value"].lower() in ("true", "yes", "y", "1")
     else:
-        ssl = False if result["Value"].lower() in ("false", "no", "n") else True
+        ssl = result["Value"].lower() in ("true", "yes", "y", "1")
     parameters["SSL"] = ssl
 
     return S_OK(parameters)

src/DIRAC/WorkloadManagementSystem/DB/ElasticJobParametersDB.py

@@ -17,6 +17,8 @@
 from DIRAC.ConfigurationSystem.Client.Helpers import CSGlobals
 from DIRAC.Core.Base.ElasticDB import ElasticDB
 from DIRAC.Core.Utilities import TimeUtilities
+from DIRAC.ConfigurationSystem.Client.Config import gConfig
+from DIRAC.ConfigurationSystem.Client.PathFinder import getDatabaseSection
 
 try:
     from opensearchpy.exceptions import NotFoundError, RequestError
@@ -49,7 +51,8 @@ def __init__(self, parentLogger=None):
         """Standard Constructor"""
 
         try:
-            indexPrefix = CSGlobals.getSetup().lower()
+            section = getDatabaseSection("WorkloadManagement/ElasticJobParametersDB")
+            indexPrefix = gConfig.getValue(f"{section}/IndexPrefix", CSGlobals.getSetup()).lower()
 
             # Connecting to the ES cluster
             super().__init__(name, "WorkloadManagement/ElasticJobParametersDB", indexPrefix, parentLogger=parentLogger)