From a0dbab48ffd5686bcb22e54716b2ed9981843611 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 1 Oct 2024 10:48:35 -0700 Subject: [PATCH 1/2] seeting Pelican cache: for all I2 caches --- topology/Internet2/Internet2Boise/I2BoiseInfrastructure.yaml | 2 +- .../Internet2Cincinnati/I2CincinnatiInfrastructure.yaml | 2 +- .../Internet2/Internet2Denver/I2DenverInfrastructure.yaml | 5 +---- .../Internet2GreatPlains/I2GreatPlainsInfrastructure.yaml | 2 +- .../Internet2/Internet2Houston/I2HoustonInfrastructure.yaml | 4 ++-- .../Internet2Jacksonville/I2JacksonvilleInfrastructure.yaml | 2 +- .../Internet2Manhattan/I2ManhattanInfrastructure.yaml | 2 +- .../Internet2Sunnyvale/I2SunnyvaleInfrastructure.yaml | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/topology/Internet2/Internet2Boise/I2BoiseInfrastructure.yaml b/topology/Internet2/Internet2Boise/I2BoiseInfrastructure.yaml index 404d02dfe..a7f6f0e36 100644 --- a/topology/Internet2/Internet2Boise/I2BoiseInfrastructure.yaml +++ b/topology/Internet2/Internet2Boise/I2BoiseInfrastructure.yaml @@ -19,7 +19,7 @@ Resources: FQDN: dtn-pas.bois.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=dtn-pas.bois.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Boise Cache AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure.yaml b/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure.yaml index f0ac6172f..8f5199e64 100644 --- a/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure.yaml +++ b/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure.yaml @@ -19,7 +19,7 @@ Resources: FQDN: dtn-pas.cinc.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=dtn-pas.cinc.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Cincinnati Cache AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml index f8b67752e..1cf805a8a 100644 --- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml +++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml @@ -19,10 +19,7 @@ Resources: FQDN: dtn-pas.denv.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=dtn-pas.denv.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Denver Cache - Details: - endpoint_override: dtn-pas.denv.nrp.internet2.edu:8443 - auth_endpoint_override: dtn-pas.denv.nrp.internet2.edu:8443 AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2GreatPlains/I2GreatPlainsInfrastructure.yaml b/topology/Internet2/Internet2GreatPlains/I2GreatPlainsInfrastructure.yaml index f69b61be6..d477a0b0f 100644 --- a/topology/Internet2/Internet2GreatPlains/I2GreatPlainsInfrastructure.yaml +++ b/topology/Internet2/Internet2GreatPlains/I2GreatPlainsInfrastructure.yaml @@ -20,7 +20,7 @@ Resources: FQDN: osg-kansas-city-stashcache.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=osg-kansas-city-stashcache.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Kansas Cache AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml index 9284c00ac..2d8eb574d 100644 --- a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml +++ b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml @@ -20,7 +20,7 @@ Resources: FQDN: osg-houston-stashcache.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=osg-houston-stashcache.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2Houston Cache AllowedVOs: - ANY @@ -41,7 +41,7 @@ Resources: FQDN: dtn-pas.hous.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=dtn-pas.hous.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Houston 2 Cache AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure.yaml b/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure.yaml index accb618a7..482653439 100644 --- a/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure.yaml +++ b/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure.yaml @@ -19,7 +19,7 @@ Resources: FQDN: dtn-pas.jack.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=dtn-pas.jack.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Jacksonville Cache AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2Manhattan/I2ManhattanInfrastructure.yaml b/topology/Internet2/Internet2Manhattan/I2ManhattanInfrastructure.yaml index 7981db8b5..591e57d3d 100644 --- a/topology/Internet2/Internet2Manhattan/I2ManhattanInfrastructure.yaml +++ b/topology/Internet2/Internet2Manhattan/I2ManhattanInfrastructure.yaml @@ -20,7 +20,7 @@ Resources: FQDN: osg-new-york-stashcache.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=osg-new-york-stashcache.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2 Manhattan Cache AllowedVOs: - ANY diff --git a/topology/Internet2/Internet2Sunnyvale/I2SunnyvaleInfrastructure.yaml b/topology/Internet2/Internet2Sunnyvale/I2SunnyvaleInfrastructure.yaml index 1d0caac24..193212dcd 100644 --- a/topology/Internet2/Internet2Sunnyvale/I2SunnyvaleInfrastructure.yaml +++ b/topology/Internet2/Internet2Sunnyvale/I2SunnyvaleInfrastructure.yaml @@ -20,7 +20,7 @@ Resources: FQDN: osg-sunnyvale-stashcache.nrp.internet2.edu DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=osg-sunnyvale-stashcache.nrp.internet2.edu Services: - XRootD cache server: + Pelican cache: Description: Internet2Sunnyvale Cache AllowedVOs: - ANY From a78bbb65306c0d42f08ec7482422d94d063bfc54 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 1 Oct 2024 10:54:08 -0700 Subject: [PATCH 2/2] Seeting cache to use Pelican cache: --- topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml | 2 +- topology/Energy Sciences Network/London/ESnetLondon.yaml | 2 +- .../SingARENSingapore/SingARENSingaporeInfrastructure.yaml | 2 +- .../AmsterdamPRP/AmsterdamPRPCachingInfrastructure.yaml | 2 +- .../San Diego Supercomputer Center/SDSC-NRP.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml index b81bda81b..c8d9af603 100644 --- a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml +++ b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml @@ -19,7 +19,7 @@ Resources: FQDN: amst-osdf-xcache01.es.net DN: /DC=org/DC=incommon/C=US/ST=California/O=Energy Sciences Network/CN=amst-osdf-xcache01.es.net Services: - XRootD cache server: + Pelican cache: Description: ESnet Amsterdam Cache AllowedVOs: - LIGO diff --git a/topology/Energy Sciences Network/London/ESnetLondon.yaml b/topology/Energy Sciences Network/London/ESnetLondon.yaml index 5fe582291..60822a85b 100644 --- a/topology/Energy Sciences Network/London/ESnetLondon.yaml +++ b/topology/Energy Sciences Network/London/ESnetLondon.yaml @@ -19,7 +19,7 @@ Resources: FQDN: lond-osdf-xcache01.es.net DN: /DC=org/DC=incommon/C=US/ST=California/O=Energy Sciences Network/CN=lond-osdf-xcache01.es.net Services: - XRootD cache server: + Pelican cache: Description: Internet2 London Cache AllowedVOs: - LIGO diff --git a/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure.yaml b/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure.yaml index b7749c930..ed170a369 100644 --- a/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure.yaml +++ b/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure.yaml @@ -19,7 +19,7 @@ Resources: FQDN: singapore.nationalresearchplatform.org DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, San Diego/CN=singapore.nationalresearchplatform.org Services: - XRootD cache server: + Pelican cache: Description: SingAREN Cache AllowedVOs: - ANY diff --git a/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure.yaml b/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure.yaml index 32df46bf3..7f997c8de 100644 --- a/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure.yaml +++ b/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure.yaml @@ -20,7 +20,7 @@ Resources: FQDN: fiona-r-uva.vlan7.uvalight.net DN: /DC=org/DC=terena/DC=tcs/C=NL/ST=Noord-Holland/O=Universiteit van Amsterdam/CN=fiona-r-uva.vlan7.uvalight.net Services: - XRootD cache server: + Pelican cache: Description: University of Amsterdam Stashcache Caching Server AllowedVOs: - ANY diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml index 669ec23b6..613cd3949 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml @@ -46,7 +46,7 @@ Resources: DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, San Diego/CN=sdsc-cache.nationalresearchplatform.org FQDN: sdsc-cache.nationalresearchplatform.org Services: - XRootD cache server: + Pelican cache: Description: SDSC NRP OSDF Cache AllowedVOs: - ANY