Also retire the ITB S3 origins

opensciencegrid · May 29, 2024 · 0b5b577 · 0b5b577
1 parent 2934cd3
commit 0b5b577
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml
@@ -311,7 +311,7 @@ Resources:
         Description: OSG VO backfill containers on the Tiger cluster, serving the ITB pool
 
   CHTC-ITB-S3-AWS-EAST-ORIGIN:
-    Active: true
+    Active: false
     Description: >-
       This is an origin used for demonstrating integration with AWS
       East S3 buckets
@@ -343,7 +343,7 @@ Resources:
       - OSG
 
   CHTC-ITB-S3-AWS-WEST-ORIGIN:
-    Active: true
+    Active: false
     Description: >-
       This is an origin used for demonstrating integration with AWS
       West S3 buckets

diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml
@@ -117,42 +117,6 @@ DataFederations:
         AllowedCaches:
           - ANY
 
-      - Path: /s3.amazonaws.com/us-east-1
-        Authorizations:
-          - PUBLIC
-          - SciTokens:
-              Issuer: https://osg-htc.org/ospool
-              Base Path: /ospool/PROTECTED,/s3.amazonaws.com/us-east-1,/s3.amazonaws.com/us-west-1
-              Map Subject: True
-        AllowedOrigins:
-          - CHTC-ITB-S3-AWS-EAST-ORIGIN
-        AllowedCaches:
-          - ANY
-        Writeback: https://s3-us-east-1.osgdev.chtc.io:1095
-        DirList: https://s3-us-east-1.osgdev.chtc.io:1095
-
-      - Path: /s3.amazonaws.com/us-west-1
-        Authorizations:
-          - PUBLIC
-          - SciTokens:
-              Issuer: https://osg-htc.org/ospool
-              Base Path: /ospool/PROTECTED,/s3.amazonaws.com/us-east-1,/s3.amazonaws.com/us-west-1
-              Map Subject: True
-        AllowedOrigins:
-          - CHTC-ITB-S3-AWS-WEST-ORIGIN
-        AllowedCaches:
-          - ANY
-        Writeback: https://s3-us-west-1.osgdev.chtc.io:1095
-        DirList: https://s3-us-west-1.osgdev.chtc.io:1095
-
-      - Path: /osn-sdsc/us-west-1/bp3d-pelican
-        Authorizations:
-          - PUBLIC
-        AllowedOrigins:
-          - SDSC_NRP_OSDF_S3_ORIGIN
-        AllowedCaches:
-          - ANY
-
       - Path: /nrdstor/protected
         Authorizations:
           - SciTokens: