From 17f527e61e78a47b108649c62d03cfc8bb294298 Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Mon, 30 Dec 2024 14:29:12 -0600 Subject: [PATCH] Undo three more changes --- README.md | 2 +- .../rucio-authserver/cms-rucio-authserver.yaml | 2 +- apps/production/prod-consistency-jobs.yaml | 17 +++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 2a4a412..519d7e8 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ The Rucio setup relies on a number of secrets being created before flux is boots This relies on three pieces of information not supplied by any repository: - `$HOSTP12`: The certificate for a node in the Rucio cluster which also has entries for the node aliases like `cms-rucio.cern.ch` - `$ROBOTP12`: The Robot certificate used for all FTS/gfal operations. This also gets used to authenticate as `root` to Rucio. -- `${INSTANCE}-secrets.cfg`: A file providing the true secrets of the Rucio install (database connection strings, passwords and tokens for various services) +- `${INSTANCE}-secrets.yaml` (not a YAML file): A file providing the true secrets of the Rucio install (database connection strings, passwords and tokens for various services) The format of this file is diff --git a/apps/base/rucio-authserver/cms-rucio-authserver.yaml b/apps/base/rucio-authserver/cms-rucio-authserver.yaml index eaeaace..610da71 100644 --- a/apps/base/rucio-authserver/cms-rucio-authserver.yaml +++ b/apps/base/rucio-authserver/cms-rucio-authserver.yaml @@ -40,7 +40,7 @@ ingress: hosts: - cms-rucio-auth.cern.ch tls: - - secretName: host-tls-secret + - secretName: rucio-server.tls-secret useSSL: true diff --git a/apps/production/prod-consistency-jobs.yaml b/apps/production/prod-consistency-jobs.yaml index 1e28951..1ab6e94 100644 --- a/apps/production/prod-consistency-jobs.yaml +++ b/apps/production/prod-consistency-jobs.yaml @@ -56,10 +56,6 @@ consistency: T2_DE_RWTH: server: grid-cms-xrootd.physik.rwth-aachen.de:1094 interval: 7 - T2_FR_GRIF_IRFU: - server: node12.datagrid.cea.fr - server_root: /cms/trivcat - interval: 7 #T2_HU_Budapest_Test: # server: grid143.kfki.hu:11000 # interval: 1 @@ -78,9 +74,6 @@ consistency: T2_IT_Bari: server: ss-01.recas.ba.infn.it:8080 interval: 7 - T2_FR_GRIF_LLR: - server: polgrid4.in2p3.fr:11001 - interval: 7 T2_RU_JINR: server: lcgsexrd.jinr.ru:1095 interval: 7 @@ -104,8 +97,8 @@ consistency: server: se.cis.gov.pl:11000 interval: 7 #T2_EE_Estonia_Test: - #server: [2001:bb8:4004:ff:d::3]:1094 - #interval: 1 + #server: [2001:bb8:4004:ff:d::3]:1094 + #interval: 1 T2_UK_SGrid_RALPP: server: heplnx228.pp.rl.ac.uk:1094 interval: 7 @@ -228,9 +221,6 @@ consistency: T2_EE_Estonia: server: xrootd.hep.kbfi.ee:1094 interval: 7 - T2_GR_Ioannina: - server: grid02.physics.uoi.gr - interval: 7 T2_HU_Budapest: server: grid143.kfki.hu:11000 interval: 7 @@ -299,3 +289,6 @@ consistency: server: gfe02.grid.hep.ph.ic.ac.uk:1094 server_root: /pnfs/hep.ph.ic.ac.uk/data/cms interval: 7 + T3_KR_UOS: + server: cms.sscc.uos.ac.kr:1094 + interval: 7