Merge pull request #4193 from biozit/master

setting caches to use Pelican cache
opensciencegrid · Oct 1, 2024 · 8d0ada5 · 8d0ada5
2 parents 2549202 + 4f79c97
commit 8d0ada5
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 17 deletions.
diff --git 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:
       - ANY
diff --git 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:
       - ANY
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -20,7 +20,7 @@ Resources:
     FQDN: amst-fiona.nationalresearchplatform.org
     DN: /CN=amst-fiona.nationalresearchplatform.org
     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
@@ -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