diff --git a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml index 9d5772415..8c46c82f8 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml @@ -223,69 +223,6 @@ Resources: Execution Endpoint: Description: OSG VO backfill container in the GPU lab - CHTC-ITB-HELM-ORIGIN: - Active: false - Description: >- - This is a testing OSDF origin server on the Tiger cluster, - deployed via Helm. It serves both public and protected data. - ID: 1370 - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000002 - Name: Matyas Selmeci - Secondary: - ID: OSG1000003 - Name: Brian Hua Lin - Security Contact: - Primary: - ID: OSG1000002 - Name: Matyas Selmeci - Secondary: - ID: OSG1000003 - Name: Brian Hua Lin - FQDN: helm-origin.osgdev.chtc.io - DN: /CN=helm-origin.osgdev.chtc.io - Services: - XRootD origin server: - Description: xrootd stash-origin and stash-origin-auth instances - VOOwnership: - OSG: 100 - AllowedVOs: - - GLOW - - CHTC-ITB-HELM-CACHE1: - Active: false - Description: >- - This is a testing StashCache cache server the Tiger cluster, - deployed via Helm. - ID: 1339 - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000003 - Name: Brian Hua Lin - Tertiary: - ID: OSG1000002 - Name: Matyas Selmeci - Security Contact: - Primary: - ID: OSG1000002 - Name: Matyas Selmeci - Secondary: - ID: OSG1000015 - Name: Aaron Moate - FQDN: helm-cache1.osgdev.chtc.io - DN: /CN=helm-cache1.osgdev.chtc.io - Services: - XRootD cache server: - Description: StashCache cache server - VOOwnership: - OSG: 100 - AllowedVOs: - - GLOW - - OSG - TIGER-OSG-BACKFILL-ITB: Active: true ContactLists: @@ -310,203 +247,3 @@ Resources: Execution Endpoint: Description: OSG VO backfill containers on the Tiger cluster, serving the ITB pool - CHTC-ITB-S3-AWS-EAST-ORIGIN: - Active: false - Description: >- - This is an origin used for demonstrating integration with AWS - East S3 buckets - ID: 1397 - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000003 - Name: Brian Hua Lin - Tertiary: - ID: OSG1000002 - Name: Matyas Selmeci - Security Contact: - Primary: - ID: OSG1000003 - Name: Brian Hua Lin - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000001 - Name: Brian Bockelman - FQDN: s3-us-east-1.osgdev.chtc.io - DN: /CN=s3-us-east-1.osgdev.chtc.io - Services: - XRootD origin server: - Description: Origin serving both authenticated and unauthenticated data - AllowedVOs: - - OSG - - CHTC-ITB-S3-AWS-WEST-ORIGIN: - Active: false - Description: >- - This is an origin used for demonstrating integration with AWS - West S3 buckets - ID: 1398 - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000003 - Name: Brian Hua Lin - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000001 - Name: Brian Bockelman - Security Contact: - Primary: - ID: OSG1000003 - Name: Brian Hua Lin - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000001 - Name: Brian Bockelman - FQDN: s3-us-west-1.osgdev.chtc.io - DN: /CN=s3-us-west-1.osgdev.chtc.io - Services: - XRootD origin server: - Description: Origin serving both authenticated and unauthenticated data - AllowedVOs: - - OSG - - CHTC-ITB-OSDF-PELICAN-ORIGIN: - Active: true - Description: >- - This is an origin used for testing the Pelican client and - integration with the OSDF - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000589 - Name: William N Swanson - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - Security Contact: - Primary: - ID: OSG1000589 - Name: William N Swanson - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - FQDN: itb-osdf-pelican-origin.osdf-dev.chtc.io - DN: /CN=itb-osdf-pelican-origin.osdf-dev.chtc.io - Services: - Pelican origin: - Description: ITB OSDF Pelican Origin - AllowedVOs: - - GLOW - - CHTC-ITB-PELICANPLATFORM-ORIGIN: - Active: true - Description: >- - This is an origin used for serving /pelicanplatform in the ITB OSDF. - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000002 - Name: Matyas Selmeci - Secondary: - ID: OSG1000589 - Name: William N Swanson - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - Security Contact: - Primary: - ID: OSG1000002 - Name: Matyas Selmeci - Secondary: - ID: OSG1000589 - Name: William N Swanson - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - FQDN: pelicanplatform-origin.osdf-dev.chtc.io - DN: /CN=pelicanplatform-origin.osdf-dev.chtc.io - Services: - Pelican origin: - Description: Origin for /pelicanplatform in ITB OSDF - AllowedVOs: - - GLOW - - ITB-OSDF-CHTC-ORIGIN: - Active: true - Description: >- - Test Pelican Origin for the CHTC Ceph - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000589 - Name: William N Swanson - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - Security Contact: - Primary: - ID: OSG1000589 - Name: William N Swanson - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - FQDN: itb-chtc-origin.osdf-dev.chtc.io - DN: /CN=itb-chtc-origin.osdf-dev.chtc.io - Services: - Pelican origin: - Description: ITB OSDF Pelican Origin - AllowedVOs: - - GLOW - - CHTC-ITB-OSDF-PELICAN-CACHE: - Active: true - Description: >- - This is a cache used for testing the Pelican client and - integration with the OSDF - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000589 - Name: William N Swanson - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - Security Contact: - Primary: - ID: OSG1000589 - Name: William N Swanson - Secondary: - ID: OSG1000002 - Name: Matyas Selmeci - Tertiary: - ID: OSG1000003 - Name: Brian Hua Lin - FQDN: itb-osdf-pelican-cache.osdf-dev.chtc.io - DN: /CN=itb-osdf-pelican-cache.osdf-dev.chtc.io - Services: - Pelican cache: - Description: ITB OSDF Pelican Cache - AllowedVOs: - - GLOW diff --git a/topology/University of Wisconsin/CHTC/CHTC-ITB_downtime.yaml b/topology/University of Wisconsin/CHTC/CHTC-ITB_downtime.yaml index 979f7aca9..03a1a79bb 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-ITB_downtime.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-ITB_downtime.yaml @@ -9,14 +9,3 @@ Services: - CE # --------------------------------------------------------- -- Class: SCHEDULED - ID: 1903815939 - Description: Downtime to test Pelican topology downtime integration - Severity: Outage - StartTime: Sep 4, 2024 12:00 -0600 - EndTime: Sep 4, 2024 17:00 -0600 - CreatedTime: Sep 4, 2024 11:00 -0600 - ResourceName: CHTC-ITB-OSDF-PELICAN-ORIGIN - Services: - - Pelican origin -# --------------------------------------------------------- diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF-ITB.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF-ITB.yaml new file mode 100644 index 000000000..818fe26bb --- /dev/null +++ b/topology/University of Wisconsin/CHTC/CHTC-OSDF-ITB.yaml @@ -0,0 +1,277 @@ +GroupDescription: CHTC resources used in the OSDF-ITB federation +Production: false +SupportCenter: Self Supported +Resources: + + ####################################################################### + # Old, pre-Pelican resources + ####################################################################### + + CHTC-ITB-HELM-ORIGIN: + Active: false + Description: >- + This was a testing OSDF origin server on the Tiger cluster, + deployed via Helm. It served both public and protected data. + ID: 1370 + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000002 + Name: Matyas Selmeci + Secondary: + ID: OSG1000003 + Name: Brian Hua Lin + Security Contact: + Primary: + ID: OSG1000002 + Name: Matyas Selmeci + Secondary: + ID: OSG1000003 + Name: Brian Hua Lin + FQDN: helm-origin.osgdev.chtc.io + DN: /CN=helm-origin.osgdev.chtc.io + Services: + XRootD origin server: + Description: xrootd stash-origin and stash-origin-auth instances + VOOwnership: + OSG: 100 + AllowedVOs: + - GLOW + + CHTC-ITB-HELM-CACHE1: + Active: false + Description: >- + This was a testing StashCache cache server the Tiger cluster, + deployed via Helm. + ID: 1339 + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Hua Lin + Tertiary: + ID: OSG1000002 + Name: Matyas Selmeci + Security Contact: + Primary: + ID: OSG1000002 + Name: Matyas Selmeci + Secondary: + ID: OSG1000015 + Name: Aaron Moate + FQDN: helm-cache1.osgdev.chtc.io + DN: /CN=helm-cache1.osgdev.chtc.io + Services: + XRootD cache server: + Description: StashCache cache server + VOOwnership: + OSG: 100 + AllowedVOs: + - GLOW + - OSG + + CHTC-ITB-S3-AWS-EAST-ORIGIN: + Active: false + Description: >- + This was an origin used for demonstrating integration with AWS + East S3 buckets + ID: 1397 + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Hua Lin + Tertiary: + ID: OSG1000002 + Name: Matyas Selmeci + Security Contact: + Primary: + ID: OSG1000003 + Name: Brian Hua Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000001 + Name: Brian Bockelman + FQDN: s3-us-east-1.osgdev.chtc.io + DN: /CN=s3-us-east-1.osgdev.chtc.io + Services: + XRootD origin server: + Description: Origin serving both authenticated and unauthenticated data + AllowedVOs: + - OSG + + CHTC-ITB-S3-AWS-WEST-ORIGIN: + Active: false + Description: >- + This was an origin used for demonstrating integration with AWS + West S3 buckets + ID: 1398 + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Hua Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000001 + Name: Brian Bockelman + Security Contact: + Primary: + ID: OSG1000003 + Name: Brian Hua Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000001 + Name: Brian Bockelman + FQDN: s3-us-west-1.osgdev.chtc.io + DN: /CN=s3-us-west-1.osgdev.chtc.io + Services: + XRootD origin server: + Description: Origin serving both authenticated and unauthenticated data + AllowedVOs: + - OSG + + + ####################################################################### + # Pelican-based resources + ####################################################################### + + CHTC-ITB-OSDF-PELICAN-ORIGIN: + Active: true + Description: >- + This is an origin used for testing the Pelican client and + integration with the OSDF + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000589 + Name: William N Swanson + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + Security Contact: + Primary: + ID: OSG1000589 + Name: William N Swanson + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + FQDN: itb-osdf-pelican-origin.osdf-dev.chtc.io + DN: /CN=itb-osdf-pelican-origin.osdf-dev.chtc.io + Services: + Pelican origin: + Description: ITB OSDF Pelican Origin + AllowedVOs: + - GLOW + + CHTC-ITB-PELICANPLATFORM-ORIGIN: + Active: true + Description: >- + This is an origin used for serving /pelicanplatform in the ITB OSDF. + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000002 + Name: Matyas Selmeci + Secondary: + ID: OSG1000589 + Name: William N Swanson + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + Security Contact: + Primary: + ID: OSG1000002 + Name: Matyas Selmeci + Secondary: + ID: OSG1000589 + Name: William N Swanson + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + FQDN: pelicanplatform-origin.osdf-dev.chtc.io + DN: /CN=pelicanplatform-origin.osdf-dev.chtc.io + Services: + Pelican origin: + Description: Origin for /pelicanplatform in ITB OSDF + AllowedVOs: + - GLOW + + ITB-OSDF-CHTC-ORIGIN: + Active: true + Description: >- + Test Pelican Origin for the CHTC Ceph + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000589 + Name: William N Swanson + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + Security Contact: + Primary: + ID: OSG1000589 + Name: William N Swanson + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + FQDN: itb-chtc-origin.osdf-dev.chtc.io + DN: /CN=itb-chtc-origin.osdf-dev.chtc.io + Services: + Pelican origin: + Description: ITB OSDF Pelican Origin + AllowedVOs: + - GLOW + + CHTC-ITB-OSDF-PELICAN-CACHE: + Active: true + Description: >- + This is a cache used for testing the Pelican client and + integration with the OSDF + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000589 + Name: William N Swanson + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + Security Contact: + Primary: + ID: OSG1000589 + Name: William N Swanson + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000003 + Name: Brian Hua Lin + FQDN: itb-osdf-pelican-cache.osdf-dev.chtc.io + DN: /CN=itb-osdf-pelican-cache.osdf-dev.chtc.io + Services: + Pelican cache: + Description: ITB OSDF Pelican Cache + AllowedVOs: + - GLOW diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF-ITB_downtime.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF-ITB_downtime.yaml new file mode 100644 index 000000000..26ccec43b --- /dev/null +++ b/topology/University of Wisconsin/CHTC/CHTC-OSDF-ITB_downtime.yaml @@ -0,0 +1,11 @@ +- Class: SCHEDULED + ID: 1903815939 + Description: Downtime to test Pelican topology downtime integration + Severity: Outage + StartTime: Sep 4, 2024 12:00 -0600 + EndTime: Sep 4, 2024 17:00 -0600 + CreatedTime: Sep 4, 2024 11:00 -0600 + ResourceName: CHTC-ITB-OSDF-PELICAN-ORIGIN + Services: + - Pelican origin +# --------------------------------------------------------- diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml index 9ae0a829f..5443b0a81 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-OSDF.yaml @@ -6,9 +6,14 @@ 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. + Description: This was a Pelican cache server at UW. ID: 958 ContactLists: Administrative Contact: @@ -37,7 +42,7 @@ Resources: CHTC_TIGER_CACHE: Active: false - Description: This is a StashCache cache server at UW running on the Tiger Kubernetes cluster. + Description: This was a StashCache cache server at UW running on the Tiger Kubernetes cluster. ID: 1098 ContactLists: Administrative Contact: @@ -64,40 +69,9 @@ 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. + Description: This was a StashCache origin server at UW. ID: 1069 ContactLists: Administrative Contact: @@ -126,7 +100,7 @@ Resources: CHTC_STASHCACHE_ORIGIN_AUTH_2000: Active: false - Description: This is a StashCache origin server at UW. + Description: This was a StashCache origin server at UW. ID: 1192 ContactLists: Administrative Contact: @@ -157,7 +131,7 @@ Resources: CHTC_NIH_ORIGIN: Active: false - Description: This is an origin server serving NIH image analysis data + Description: This was an origin server serving NIH image analysis data ID: 1454 ContactLists: Administrative Contact: @@ -184,7 +158,7 @@ Resources: CHTC_OSGDEV_SHOVELER_CACHE: Active: false - Description: This is a testing StashCache cache server with a shoveler at UW running on the Tiger Kubernetes cluster. + Description: This was a testing StashCache cache server with a shoveler at UW running on the Tiger Kubernetes cluster. ContactLists: Administrative Contact: Primary: @@ -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