Skip to content

Commit 22215fa

Browse files
matyasselmecimatyasselmeci
authored
Merge branch 'v4' into pr/missedaspot
2 parents 358d6ee + 45af947 commit 22215fa

File tree

3 files changed

+14
-35
lines changed

3 files changed

+14
-35
lines changed

‎README.md‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -343,40 +343,6 @@ This section is contained in `/etc/osg/config.d/30-infoservices.ini`, which is p
343343
- Otherwise, set this to the `hostname:port` of a host running a `condor-ce-collector` daemon
344344

345345

346-
### 30-rsv.ini / [RSV] section ###
347-
348-
This section handles the configuration and setup of the RSV services.
349-
350-
This section is contained in `/etc/osg/config.d/30-rsv.ini` which is provided by the `osg-configure-rsv` RPM.
351-
352-
| Option | Values Accepted | Explanation |
353-
|----------------------|---------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
354-
| **enabled** | `True`, `False`, `Ignore` | This indicates whether the rsv service is being used or not. |
355-
| **rsv_user** | String | This gives username that rsv will run under. If this is blank or set to `UNAVAILABLE`, it will default to rsv. |
356-
| **gratia_probes** | String | This settings indicates which rsv gratia probes should be used. It is a list of probes separated by a comma. Valid probes are metric, condor, pbs, lsf, sge, managedfork, hadoop-transfer, and gridftp-transfer |
357-
| ce_hosts | String | This option lists the serviceURI of the CEs that generic RSV CE probes should check. This should be a list of serviceURIs (`hostname[:port/service]`) separated by a comma (e.g. `my.host,my.host2,my.host3:2812`). |
358-
| htcondor_ce_hosts | String | This option lists the serviceURI of the HTCondor-CE-based CEs that the RSV HTCondor-CE probes should check. This should be a list of serviceURIs (`hostname[:port/service]`) separated by a comma (e.g. `my.host,my.host2,my.host3:2812`). | |
359-
| gridftp_hosts | String | This option lists the serviceURI of the GridFTP servers that the RSV GridFTP probes should check. This should be a list of serviceURIs (`hostname[:port/service]`) separated by a comma (e.g. `my.host.iu.edu:2812,my.host2,my.host3`). |
360-
| gridftp_dir | String | This should be the directory that the GridFTP probes should use during testing. This defaults to `/tmp` if left blank or set to `UNAVAILABLE`. |
361-
| **srm_hosts** | String | This option lists the serviceURI of the srm servers that the RSV srm probes should check. This should be a list of serviceURIs (`hostname[:port/service]`) separated by a comma (e.g. `my.host,my.host2,my.host3:8444`). |
362-
| srm_dir | String | This should be the directory that the srm probes should use during testing. |
363-
| srm_webservice_path | String | This option gives the webservice path that SRM probes need to use along with the host:port. See note. |
364-
| service_cert | String | This option should point to the public key file (pem) for your service certificate. If this is left blank or set to `UNAVAILABLE` and the `user_proxy` setting is set, it will default to `/etc/grid-security/rsvcert.pem` |
365-
| service_key | String | This option should point to the private key file (pem) for your service certificate. If this is left blank or set to `UNAVAILABLE` and the `service_cert` setting is enabled, it will default to `/etc/grid-security/rsvkey.pem` . |
366-
| service_proxy | String | This should point to the location of the rsv proxy file. If this is left blank or set to `UNAVAILABLE` and the use_service_cert setting is enabled, it will default to `/tmp/rsvproxy`. |
367-
| user_proxy | String | If you don't use a service certificate for rsv, you will need to specify a proxy file that RSV should use in the proxy_file setting. If this is set, then service_cert, service_key, and service_proxy should be left blank, or set to `UNAVAILABE` or `DEFAULT`. |
368-
| **setup_rsv_nagios** | `True`, `False` | This option indicates whether rsv should upload results to a local nagios server instance. This should be set to True or False.<br> This plugin is provided as an experimental component, and admins are recommend *not to enable* it on production resources. |
369-
| rsv_nagios_conf_file | String | This option indicates the location of the rsv nagios file to use for configuration details. This file *needs to be configured locally for RSV-Nagios forwarding to work* -- see inline comments in file for more information. |
370-
| condor_location | String | If you installed Condor in a non-standard location (somewhere other than /usr, which is where the RPM puts it) you must specify the path to the install dir here. |
371-
372-
**Note for srm_webservice_path:**<br>
373-
For dcache installations, this should work if left blank. However
374-
Bestman-xrootd SEs normally use `srm/v2/server` as web service path, and so
375-
Bestman-xrootd admins will have to pass this option with the appropriate
376-
value (for example: `srm/v2/server`) for the SRM probes to pass on their
377-
SE.
378-
379-
380346
### 31-cluster.ini / [Subcluster] and [Resource Entry] sections ###
381347

382348
Subcluster and Resource Entry configuration is for reporting about the worker resources on your site. A **subcluster** is a homogeneous set of worker node hardware; a **resource** is a set of subcluster(s) with common capabilities that will be reported to the ATLAS AGIS system.

‎config/30-rsv.ini‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2+
;; WARNING
3+
;; RSV configuration is deprecated and will be removed in the near
4+
;; future, within the v4 series.
5+
6+
7+
8+
9+
10+
111
;===================================================================
212
; IMPORTANT
313
;===================================================================
@@ -20,7 +30,7 @@
2030
; If you are using rsv-control to enable or disable specific metrics, you should set
2131
; this to Ignore so that your configuration does not get overwritten each time that
2232
; osg-configure is run.
23-
enabled = True
33+
enabled = Ignore
2434

2535

2636
; You must use a certificate with RSV. Either you can use a service certificate

‎osg_configure/configure_modules/rsv.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@ def check_attributes(self, attributes):
221221
self.log('RsvConfiguration.check_attributes completed')
222222
return attributes_ok
223223

224+
self.logger.warning("*** RsvConfiguration is deprecated and will be removed in the near future, "
225+
"within the v4 series. ***")
226+
224227
try:
225228
(self.uid, self.gid) = pwd.getpwnam(self._rsv_user)[2:4]
226229
except KeyError: # no such user

0 commit comments

Comments
 (0)