Merge branch 'master' into patch-3

opensciencegrid · Jan 15, 2025 · d263c14 · d263c14
2 parents 3a41963 + 3a7bb5f
commit d263c14
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/topology/Purdue University/Purdue CMS/Purdue_downtime.yaml b/topology/Purdue University/Purdue CMS/Purdue_downtime.yaml
@@ -2461,3 +2461,14 @@
   Services:
   - net.perfSONAR.Latency
 # ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 2019653048
+  Description: OS upgrade for Slurm controller and CE
+  Severity: Outage
+  StartTime: Jan 22, 2025 11:00 +0000
+  EndTime: Jan 22, 2025 22:00 +0000
+  CreatedTime: Jan 15, 2025 18:21 +0000
+  ResourceName: Purdue-Hammer
+  Services:
+  - CE
+# ---------------------------------------------------------
diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml
@@ -751,4 +751,41 @@ Resources:
     VOOwnership:
       GLOW: 100
 
+  CHTC-oconnor-ap:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000015
+          Name: Aaron Moate
+        Secondary:
+          ID: OSG1000141
+          Name: Joe Bartkowiak
+        Tertiary:
+          ID: OSG1000003
+          Name: Brian Hua Lin
+      Security Contact:
+        Primary:
+          ID: OSG1000015
+          Name: Aaron Moate
+        Secondary:
+          ID: OSG1000141
+          Name: Joe Bartkowiak
+        Tertiary:
+          ID: OSG1000003
+          Name: Brian Hua Lin
+    Description: CHTC Access Point
+    FQDN: oconnor-ap2000.chtc.wisc.edu
+    FQDNAliases:
+    - oconnor-ap.chtc.wisc.edu
+    Services:
+      Submit Node:
+        Description: OSPool access point
+        Details:
+          hidden: false
+    Tags:
+      - OSPool
+    VOOwnership:
+      GLOW: 100
+
 SupportCenter: GLOW-TECH