Group Pelican and pre-Pelican resources in CHTC-OSDF.yaml

matyasselmeci · Jan 8, 2025 · aaa2759 · aaa2759
1 parent 2411427
commit aaa2759
Showing 1 changed file with 41 additions and 31 deletions.
diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml
@@ -6,6 +6,11 @@ GroupDescription: These are the OSDF resources at CHTC
 GroupID: 1359
 
 Resources:
+
+  #######################################################################
+  # Old, pre-Pelican resources
+  #######################################################################
+
   CHTC_STASHCACHE_CACHE:
     Active: false
     Description: This is a Pelican cache server at UW.
@@ -64,37 +69,6 @@ Resources:
     AllowedVOs:
       - ANY
 
-  CHTC_STASHCACHE_ORIGIN:
-    Active: true
-    Description: This is a Pelican origin server at UW serving /chtc/PUBLIC
-    ID: 959
-    ContactLists:
-      Administrative Contact:
-        Primary:
-          ID: OSG1000002
-          Name: Matyas Selmeci
-        Secondary:
-          ID: OSG1000015
-          Name: Aaron Moate
-      Security Contact:
-        Primary:
-          ID: OSG1000002
-          Name: Matyas Selmeci
-        Secondary:
-          ID: OSG1000015
-          Name: Aaron Moate
-    FQDN: sc-origin.chtc.wisc.edu
-    DN: /CN=sc-origin.chtc.wisc.edu
-    Services:
-      Pelican origin:
-        Description: Pelican origin server
-        Details:
-          endpoint_override: sc-origin.chtc.wisc.edu:1095
-    VOOwnership:
-      GLOW: 100
-    AllowedVOs:
-      - ANY
-
   CHTC_STASHCACHE_ORIGIN_2000:
     Active: false
     Description: This is a StashCache origin server at UW.
@@ -210,6 +184,42 @@ Resources:
     AllowedVOs:
       - ANY
 
+
+  #######################################################################
+  # Pelican-based resources
+  #######################################################################
+
+  CHTC_STASHCACHE_ORIGIN:
+    Active: true
+    Description: This is a Pelican origin server at UW serving /chtc/PUBLIC
+    ID: 959
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: sc-origin.chtc.wisc.edu
+    DN: /CN=sc-origin.chtc.wisc.edu
+    Services:
+      Pelican origin:
+        Description: Pelican origin server
+        Details:
+          endpoint_override: sc-origin.chtc.wisc.edu:1095
+    VOOwnership:
+      GLOW: 100
+    AllowedVOs:
+      - ANY
+
   CHTC_PELICAN_CACHE:
     Active: true
     Description: This is a Pelican cache server at UW running on the Tiger Kubernetes cluster