Skip to content

Commit ca12a95

Browse files
authored
Merge pull request #5754 from fstagni/80_fixes10
[8.0] docs and test py2 removals
2 parents df5fa1a + 2436442 commit ca12a95

File tree

13 files changed

+313
-668
lines changed

13 files changed

+313
-668
lines changed

docs/source/AdministratorGuide/Configuration/ConfReference/Operations/Pilots/index.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ Parameter Description De
99
================== ======================================================== ===============================================================================================
1010
Version What project version will be used Version with which the component that submits pilot jobs is installed
1111
------------------ -------------------------------------------------------- -----------------------------------------------------------------------------------------------
12-
DIRACOS If set, it will use the --dirac-os options to install False
13-
DIRAC within the pilot
14-
------------------ -------------------------------------------------------- -----------------------------------------------------------------------------------------------
1512
Project What installation project will be used when submitting DIRAC
1613
pilot jobs to the resources
1714
------------------ -------------------------------------------------------- -----------------------------------------------------------------------------------------------

docs/source/AdministratorGuide/Configuration/ConfReference/Tips/Authorization/index.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ are showed in the next table:
1313
+----------------------------+------------------------------------------------------------------+-------------+
1414
| *AlarmsManagement* | Allow to set notifications and manage alarms | |
1515
+----------------------------+------------------------------------------------------------------+-------------+
16-
| *BookkeepingManagement* | Allow Bookkeeping Management | |
17-
+----------------------------+------------------------------------------------------------------+-------------+
1816
| *CSAdministrator* | CS Administrator - possibility to edit the Configuration Service | |
1917
+----------------------------+------------------------------------------------------------------+-------------+
2018
| *FileCatalogManagement* | Allow FC Management | |
@@ -41,8 +39,6 @@ are showed in the next table:
4139
+----------------------------+------------------------------------------------------------------+-------------+
4240
| *ProxyManagement* | Allow managing proxies | |
4341
+----------------------------+------------------------------------------------------------------+-------------+
44-
| *PPGAuthority* | Allow production request approval on behalf of PPG | |
45-
+----------------------------+------------------------------------------------------------------+-------------+
4642
| *ServiceAdministrator* | DIRAC Service Administrator | |
4743
+----------------------------+------------------------------------------------------------------+-------------+
4844
| *SiteManager* | Site Manager | |

docs/source/AdministratorGuide/ExternalsSupport/index.rst

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,23 @@
44
Supported environments and packages
55
===================================
66

7-
OS:
8-
---
7+
OS
8+
--
99

10-
DIRAC *server* installation is officially supported only for:
10+
DIRAC needs `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_ for its dependencies. DIRACOS includes all dependencies (except for glibc), including Python and Grid middleware.
1111

12-
- CERN CentOS 7 (`CC7 <https://linux.web.cern.ch/centos7/>`_)
12+
DIRAC *client* installation is supported for all x86_64 Linux installations using `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_. This includes installations made by the pilots.
1313

14-
Tests are also regularly run for other platforms but no official support is offered for them.
14+
DIRAC *server* installation is supported for *most* x86_64 Linux installations using `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_. Other architectures and platforms may work as a server installation, however this is on a best effort basis and is not regularly tested.
1515

16-
17-
Python versions:
18-
----------------
19-
20-
DIRAC brings its own version of python at installation time: this version is right now fixed to 2.7.13.
21-
An experimental support for python3 server installations is also offered from DIRAC version 7.3.
22-
23-
DIRAC installation scripts (including pilots) use the native python version, and for this the python versions supported are:
24-
25-
- 2.6.9 (native on SLC6)
26-
- 2.7.5 (native on CC7)
27-
- 2.7.13
28-
- 3.6.8+
29-
30-
MySQL versions:
31-
---------------
16+
MySQL versions
17+
--------------
3218

3319
MySQL is a hard dependency for all DIRAC servers installations. Supported versions:
3420

35-
- 5.7
36-
- 8.0
21+
- MySQL 5.7
22+
- MySQL 8.0
23+
- MariaDB versions "compatible" with the above MySQL versions.
3724

3825
MySQL server is not shipped with DIRAC. You are responsible of its administration.
3926

@@ -52,26 +39,27 @@ generic connection details can be applied in CS location below (the shown values
5239
}
5340

5441

55-
ElasticSearch versions:
56-
-----------------------
42+
ElasticSearch versions
43+
----------------------
5744

5845
ElasticSearch is an optional dependency for DIRAC servers installations. Supported versions:
5946

6047
- 7.x
48+
- OpenDistro and OpenSearch releases "compatible" with the above ElasticSearch versions.
6149

6250
ElasticSearch server is not shipped with DIRAC. You are responsible of its administration.
6351

6452
You can run your ES cluster without authentication, or using User name and password, or using certificates. You may add the following parameters:
6553

66-
- ``User`` (default:'')
67-
- ``Password`` (default:'')
68-
- ``Host`` (default:localhost)
69-
- ``Port`` (default:9201)
70-
- ``SSL`` (default:True)
71-
- ``CRT`` (default:True)
72-
- ``ca_certs`` (default:None)
73-
- ``client_key`` (default:None)
74-
- ``client_cert`` (default:None)
54+
- ``User`` (default:``''``)
55+
- ``Password`` (default:``''``)
56+
- ``Host`` (default:``localhost``)
57+
- ``Port`` (default:``9201``)
58+
- ``SSL`` (default:``True``)
59+
- ``CRT`` (default:``True``)
60+
- ``ca_certs`` (default:``None``)
61+
- ``client_key`` (default:``None``)
62+
- ``client_cert`` (default:``None``)
7563

7664

7765
to the location::

0 commit comments

Comments
 (0)