Merge branch 'master' into feature/automerge-unknown-institution-id

opensciencegrid · Jun 12, 2024 · 09a31c5 · 09a31c5
2 parents cc2edfa + a7e7524
commit 09a31c5
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 7 deletions.
diff --git a/...-D/National Fusion Facility/FDP-OSDF.yaml → ...ty/National Fusion Facility/FDP-OSDF.yaml b/...-D/National Fusion Facility/FDP-OSDF.yaml → ...ty/National Fusion Facility/FDP-OSDF.yaml
diff --git a/...DIII-D/National Fusion Facility/SITE.yaml → ...cility/National Fusion Facility/SITE.yaml b/...DIII-D/National Fusion Facility/SITE.yaml → ...cility/National Fusion Facility/SITE.yaml
diff --git a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml
@@ -0,0 +1,11 @@
+- Class: UNSCHEDULED
+  ID: 1830524787
+  Description: '#toPelican'
+  Severity: Outage
+  StartTime: Jun 10, 2024 08:00 +0000
+  EndTime: Jun 15, 2024 06:59 +0000
+  CreatedTime: Jun 10, 2024 20:47 +0000
+  ResourceName: AMSTERDAM_ESNET_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml
@@ -9,3 +9,14 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1830385994
+  Description: HW issues
+  Severity: Outage
+  StartTime: Jun 10, 2024 08:01 +0000
+  EndTime: Jun 21, 2024 19:30 +0000
+  CreatedTime: Jun 10, 2024 16:56 +0000
+  ResourceName: HOUSTON2_INTERNET2_OSDF_CACHE
+  Services:
+  - XRootD cache server
+# ---------------------------------------------------------
diff --git a/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml b/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml
@@ -97,4 +97,15 @@
   Services:
   - XRootD cache server
 # ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1830324854
+  Description: Upgrade CE from CentOS 7 to Alma 9 and OSG from 3.6 to 23
+  Severity: Outage
+  StartTime: Jun 12, 2024 13:00 +0000
+  EndTime: Jun 13, 2024 16:00 +0000
+  CreatedTime: Jun 10, 2024 15:14 +0000
+  ResourceName: LEHIGH-HAWK-CE
+  Services:
+  - CE
+# ---------------------------------------------------------
 
diff --git a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml
@@ -264,4 +264,42 @@ Resources:
           endpoint: psuta01.atlas-swt2.org
     VOOwnership:
       ATLAS: 100
+  SWT2_CPB_K8S:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000710
+          Name: Armen Vartapetian
+        Secondary:
+          ID: 85358c47f16fad2a915da157353581016788a30a
+          Name: Mark Sosebee
+      Security Contact:
+        Primary:
+          ID: OSG1000710
+          Name: Armen Vartapetian
+        Secondary:
+          ID: 85358c47f16fad2a915da157353581016788a30a
+          Name: Mark Sosebee
+    Description: ATLAS Tier2 Kubernetes queue
+    FQDN: cpb-k8s.atlas-swt2.org  # placeholder
+    Services:
+      Execution Endpoint:
+        Description: Container-based ATLAS PanDA pilots
+        Details:
+          hidden: false
+    VOOwnership:
+      ATLAS: 100
+    WLCGInformation:
+      APELNormalFactor: 12.52
+      AccountingName: US-SWT2
+      HEPSPEC: 102816
+      InteropAccounting: true
+      InteropBDII: true
+      InteropMonitoring: true
+      KSI2KMax: 2086
+      KSI2KMin: 2086
+      StorageCapacityMax: 5000
+      StorageCapacityMin: 5000
+      TapeCapacity: 0
 SupportCenter: USATLAS
diff --git a/virtual-organizations/GLOW.yaml b/virtual-organizations/GLOW.yaml
@@ -123,7 +123,7 @@ DataFederations:
         AllowedCaches:
           - ANY
         Writeback: https://origin-auth2000.chtc.wisc.edu:1095
-        DirList: https://origin-auth2000.chtc.wisc.edu:1095
+        #DirList: https://origin-auth2000.chtc.wisc.edu:1095
         CredentialGeneration:
           BasePath: /chtc
           Strategy: OAuth2

diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml
@@ -153,7 +153,7 @@ DataFederations:
         AllowedCaches:
           - ANY
         Writeback: https://ap20.uc.osg-htc.org:1095
-        DirList: https://ap20.uc.osg-htc.org:1095
+        #DirList: https://ap20.uc.osg-htc.org:1095
         CredentialGeneration:
           Strategy: OAuth2
           Issuer: https://osg-htc.org/ospool
@@ -170,7 +170,7 @@ DataFederations:
         AllowedCaches:
           - ANY
         Writeback: https://ap21.uc.osg-htc.org:1095
-        DirList: https://ap21.uc.osg-htc.org:1095
+        #DirList: https://ap21.uc.osg-htc.org:1095
         CredentialGeneration:
           Strategy: OAuth2
           Issuer: https://osg-htc.org/ospool
@@ -187,7 +187,7 @@ DataFederations:
         AllowedCaches:
           - ANY
         Writeback: https://ap22.uc.osg-htc.org:1095
-        DirList: https://ap22.uc.osg-htc.org:1095
+        #DirList: https://ap22.uc.osg-htc.org:1095
         CredentialGeneration:
           Strategy: OAuth2
           Issuer: https://osg-htc.org/ospool
@@ -204,7 +204,7 @@ DataFederations:
         AllowedCaches:
           - ANY
         Writeback: https://ospool-ap2140.chtc.wisc.edu:8443
-        DirList: 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
@@ -252,7 +252,7 @@ DataFederations:
         AllowedCaches:
           - ANY
         Writeback: https://ap23.uc.osg-htc.org:1095
-        DirList: https://ap23.uc.osg-htc.org:1095
+        #DirList: https://ap23.uc.osg-htc.org:1095
         CredentialGeneration:
           Strategy: OAuth2
           Issuer: https://osg-htc.org/ospool/uc-shared

diff --git a/virtual-organizations/REPORTING_GROUPS.yaml b/virtual-organizations/REPORTING_GROUPS.yaml
@@ -141,7 +141,7 @@ atlas:
     Name: Joel Snow
   - ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
     Name: Xin Zhao
-  - ID: 4884a2d919bc5079022317a8403f84a117f2d25b
+  - ID: OSG1000710
     Name: Armen Vartapetian
   FQANs:
   - GroupName: /atlas