Merge pull request #4068 from matyasselmeci/pr/pelican-services

Use 'Pelican cache'/'Pelican origin' service for known CHTC Pelican caches and origins
opensciencegrid · Aug 9, 2024 · 8ad1b20 · 8ad1b20
2 parents 01acbce + 574181b
commit 8ad1b20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml
@@ -8,7 +8,7 @@ GroupID: 1359
 Resources:
   CHTC_STASHCACHE_CACHE:
     Active: true
-    Description: This is a StashCache cache server at UW.
+    Description: This is a Pelican cache server at UW.
     ID: 958
     ContactLists:
       Administrative Contact:
@@ -28,11 +28,8 @@ Resources:
     FQDN: sc-cache.chtc.wisc.edu
     DN: /CN=sc-cache.chtc.wisc.edu
     Services:
-      XRootD cache server:
-        Description: StashCache cache server
-        Details:
-          endpoint_override: sc-cache.chtc.wisc.edu:8443
-          auth_endpoint_override: sc-cache.chtc.wisc.edu:8443
+      Pelican cache:
+        Description: Pelican cache server
     VOOwnership:
       GLOW: 100
     AllowedVOs:
@@ -69,7 +66,7 @@ Resources:
 
   CHTC_STASHCACHE_ORIGIN:
     Active: true
-    Description: This is a StashCache origin server at UW.
+    Description: This is a Pelican origin server at UW serving /chtc/PUBLIC
     ID: 959
     ContactLists:
       Administrative Contact:
@@ -89,8 +86,8 @@ Resources:
     FQDN: sc-origin.chtc.wisc.edu
     DN: /CN=sc-origin.chtc.wisc.edu
     Services:
-      XRootD origin server:
-        Description: StashCache origin server
+      Pelican origin:
+        Description: Pelican origin server
         Details:
           endpoint_override: sc-origin.chtc.wisc.edu:1095
     VOOwnership:

diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml
@@ -533,12 +533,8 @@ Resources:
         Description: OS Pool access point
         Details:
           hidden: false
-      XRootD origin server:
+      Pelican origin:
         Description: OSDF Pelican origin
-        Details:
-          hidden: false
-          endpoint_override: ospool-ap2140.chtc.wisc.edu:8443
-          auth_endpoint_override: ospool-ap2140.chtc.wisc.edu:8443          
     Tags:
       - OSPool
     VOOwnership: