Skip to content

Commit

Permalink
Merge branch 'master' into patch-972237
Browse files Browse the repository at this point in the history
  • Loading branch information
brianhlin authored Jan 8, 2025
2 parents b3c3739 + 93fadac commit 2ae0af8
Show file tree
Hide file tree
Showing 6 changed files with 337 additions and 280 deletions.
File renamed without changes.
230 changes: 0 additions & 230 deletions topology/University of Wisconsin/CHTC/CHTC-ITB.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -310,170 +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

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
11 changes: 0 additions & 11 deletions topology/University of Wisconsin/CHTC/CHTC-ITB_downtime.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ---------------------------------------------------------
Loading

0 comments on commit 2ae0af8

Please sign in to comment.