Merge pull request #3784 from brianhlin/INF-1796.new-ap40-origin

First attempt at registering new AP40 Pelican origin (INF-1796)
opensciencegrid · May 8, 2024 · cef443e · cef443e
2 parents 286ab5e + d9be964
commit cef443e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml
@@ -526,15 +526,25 @@ Resources:
       - ap2007.chtc.wisc.edu 
       - ospool-ap2040.chtc.wisc.edu
       - ap40.chtc.wisc.edu
+      - ospool-2140.chtc.wisc.edu
+    DN: /CN=ospool-ap2140.chtc.wisc.edu
     Services:
       Submit Node:
         Description: OS Pool access point
         Details:
           hidden: false
+      XRootD origin server:
+        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:
       OSG: 100
+    AllowedVOs:
+      - OSG
 
   CHTC-ospool-eht:
     Active: true

diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml
@@ -257,6 +257,23 @@ DataFederations:
           Issuer: https://osg-htc.org/ospool
           MaxScopeDepth: 4
 
+      - Path: /ospool/ap40/data
+        Authorizations:
+          - SciTokens:
+              Issuer: https://ospool-ap2140.chtc.wisc.edu:8443
+              Base Path: /ospool/ap40
+              Map Subject: True
+        AllowedOrigins:
+          - CHTC-ap40
+        AllowedCaches:
+          - ANY
+        Writeback: https://ospool-ap2140.chtc.wisc.edu:8443
+        DirList: https://ospool-ap2140.chtc.wisc.edu:8443
+        CredentialGeneration:
+          Strategy: OAuth2
+          Issuer: https://ospool-ap2140.chtc.wisc.edu:8443
+          MaxScopeDepth: 4
+
       # SciTokens issuer for ap20
       - Path: /ospool/ap20/.well-known
         Authorizations: