Merge pull request #7998 from fstagni/cherry-pick-2-0204a176c-integra…

…tion [sweep:integration] docs: updates for setup removals
DIRACGrid · Jan 17, 2025 · d89cc44 · d89cc44
2 parents e1fd723 + c51fd8e
commit d89cc44
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/...ministratorGuide/Configuration/ConfReference/Operations/JobScheduling/index.rst b/...ministratorGuide/Configuration/ConfReference/Operations/JobScheduling/index.rst
@@ -4,7 +4,7 @@
 Job Scheduling
 =========================================
 
-The */Operations/<vo>/<setup>/JobScheduling* section contains all parameters that define DIRAC's behaviour when deciding what job has to be
+The */Operations/<vo>/JobScheduling* section contains all parameters that define DIRAC's behaviour when deciding what job has to be
 executed. Here's a list of parameters that can be defined:
 
 =========================  ========================================================  ===============================================================================================
@@ -46,7 +46,7 @@ Example
 ========
 
 An example with all the options under *JobScheduling* follows. Remember that JobScheduling is defined under
-*/Operations/<vo>/<setup>/JobScheduling* for multi-VO installations, and */Operations/<setup>/JobScheduling* for single-VO ones::
+*/Operations/<vo>/JobScheduling* for multi-VO installations, and */Operations/JobScheduling* for single-VO ones::
 
  JobScheduling
  {

diff --git a/...urce/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst b/...urce/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst
@@ -2,7 +2,7 @@
 Pilot version
 =========================================
 
-The */Operations/<vo>/<setup>/Pilot* section define What version of DIRAC will be used to submit pilot jobs to the resources.
+The */Operations/<vo>/Pilot* section define What version of DIRAC will be used to submit pilot jobs to the resources.
 
 ==================  ========================================================  ===============================================================================================
 Parameter           Description                                               Default value

diff --git a/docs/source/AdministratorGuide/Configuration/ConfReference/Systems/index.rst b/docs/source/AdministratorGuide/Configuration/ConfReference/Systems/index.rst
@@ -43,7 +43,7 @@ For this reason, there is the possibility to define a entry in the Operation sec
 
 .. code-block:: guess
 
-  Operations/<Setup>/MainServers = server1, server2
+  Operations/MainServers = server1, server2
 
 
 There should be no port, no protocol. In the system configuration, one can then write:

diff --git a/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst b/docs/source/AdministratorGuide/Systems/MonitoringSystem/index.rst
@@ -92,7 +92,7 @@ This can be done either via the CS or directly in the web app in the Configurati
 
    Operations
    {
-     <VO|Setup|Defaults>
+     <VO|Defaults>
      {
        MonitoringBackends
        {

diff --git a/docs/source/AdministratorGuide/Systems/WorkloadManagement/JobsPriorities.rst b/docs/source/AdministratorGuide/Systems/WorkloadManagement/JobsPriorities.rst
@@ -93,8 +93,8 @@ DIRAC includes a priority correction mechanism. The idea behind it is to look at
 the past history and alter the priorities assigned based on it. It can have
 multiple plugins but currently it only has one. All correctors have a CS section
 to configure themselves under
-`/Operations/<vo>/<setup>/JobScheduling/ShareCorrections`. The option
-`/Operations/<vo>/<setup>/JobScheduling/ShareCorrections/ShareCorrectorsToStart`
+`/Operations/<vo>/JobScheduling/ShareCorrections`. The option
+`/Operations/<vo>/JobScheduling/ShareCorrections/ShareCorrectorsToStart`
 defines witch correctors will be used in each iteration.
 
 WMSHistory corrector

diff --git a/...rce/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst b/...rce/DeveloperGuide/AddingNewComponents/Utilities/CSHelpers/Operations/index.rst
@@ -4,8 +4,8 @@ Helper for accessing /Operations
 
 */Operations* section is *VO* and *setup* aware. That means that configuration for different *VO/setup* will have a different CS path:
 
- * For multi-VO installations */Operations/<vo>/<setup>* should be used.
- * For single-VO installations */Operations/<setup>* should be used.
+ * For multi-VO installations */Operations/<vo>* should be used.
+ * For single-VO installations */Operations* should be used.
 
 In any case, there is the possibility to define a default configuration, that is valid for all the *setups*. The *Defaults* keyword can be used instead of the setup. For instance */Operations/myvo/Defaults*.
 

diff --git a/docs/source/DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst b/docs/source/DeveloperGuide/Internals/Core/componentsAuthNandAuthZ.rst
@@ -10,7 +10,7 @@ for authentication and authorization purposes.
 Components can be instructed to use a "shifter proxy" for authN and authZ of their service calls.
 A shifter proxy is proxy certificate, which should be:
 
-- specified in the "Operations/<setup>/Shifter" section of the CS
+- specified in the "Operations/Shifter" section of the CS
 - uploaded to the ProxyManager (i.e. using "--upload" option of dirac-proxy-init)
 
 Within an agent, in the "initialize" method, we can specify::

diff --git a/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py b/src/DIRAC/MonitoringSystem/DB/MonitoringDB.py
@@ -3,7 +3,7 @@
 
 **Configuration Parameters**:
 
-The following option can be set in `Systems/Monitoring/<Setup>/Databases/MonitoringDB`
+The following option can be set in `Systems/Monitoring/Databases/MonitoringDB`
 
 * *IndexPrefix*:  Prefix used to prepend to indexes created in the ES instance. If this
                   is not present in the CS, the indexes are prefixed with the setup name.

diff --git a/src/DIRAC/Resources/Storage/CTAStorage.py b/src/DIRAC/Resources/Storage/CTAStorage.py
@@ -10,7 +10,7 @@ class CTAStorage(GFAL2_XROOTStorage):
 
     It basically is XROOT with added tape capabilities.
     Since CTA supports ONLY xroot, do not forget to add
-    xroot in your `Operations/<Setup>/DataManagement/RegistrationProtocols` list
+    xroot in your `Operations/DataManagement/RegistrationProtocols` list
 
     Configuration example::
 

diff --git a/src/DIRAC/WorkloadManagementSystem/DB/JobDB.py b/src/DIRAC/WorkloadManagementSystem/DB/JobDB.py
@@ -5,7 +5,7 @@
 
 **Configuration Parameters**:
 
-The following options can be set in ``Systems/WorkloadManagement/<Setup>/Databases/JobDB``
+The following options can be set in ``Systems/WorkloadManagement/Databases/JobDB``
 
 * *MaxRescheduling*:     Set the maximum number of times a job can be rescheduled, default *3*.
 * *CompressJDLs*:        Enable compression of JDLs when they are stored in the database, default *False*.

diff --git a/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py b/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py
@@ -180,7 +180,7 @@ def syncScripts(self) -> DOKReturnType[Any]:
             for fileVO in glob.glob(scriptDir):
                 tarFiles.append(fileVO)
         else:
-            self.log.info("The /Operations/<Setup>/Pilot/pilotVORepo option is not defined, using Vanilla DIRAC pilot")
+            self.log.info("The /Operations/Pilot/pilotVORepo option is not defined, using Vanilla DIRAC pilot")
 
         # DIRAC repo
         pilotLocalRepo = os.path.join(self.workDir, "pilotLocalRepo")