Merge pull request #3805 from ivukotic/NRP-varnishes

Nrp varnishes changes
opensciencegrid · Apr 17, 2024 · 0fb36c7 · 0fb36c7
2 parents 8ee4e14 + f67470e
commit 0fb36c7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 56 deletions.
diff --git a/topology/Stanford University/SLAC/WT2.yaml b/topology/Stanford University/SLAC/WT2.yaml
@@ -226,32 +226,5 @@ Resources:
           endpoint: psnr-farm10.slac.stanford.edu
     VOOwnership:
       ATLAS: 100
-  SLAC_VARNISH_FRONTIER_NRP:
-    Active: true
-    ContactLists:
-      Administrative Contact:
-        Primary:
-          ID: OSG1000064
-          Name: Ilija Vukotic
-        Secondary:
-          ID: cf2de3eba56782b901bade70fe8bc1c18c36dd90
-          Name: Wei Yang
-      Security Contact:
-        Primary:
-          ID: OSG1000064
-          Name: Ilija Vukotic
-        Secondary:
-          ID: cf2de3eba56782b901bade70fe8bc1c18c36dd90
-          Name: Wei Yang
-    Description: Varnish cache located at UCSC
-    FQDN: seaweed-dtn100-1.ucsc.edu
-    Services:
-      Squid:
-        Description: Varnish based squid service for Frontier at NRP
-        Details:
-          uri_override: seaweed-dtn100-1.ucsc.edu:6082
-          Monitored: true
-    VOOwnership:
-      ATLAS: 100
 
 SupportCenter: USATLAS
diff --git a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml
@@ -327,8 +327,7 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-    Description:
-      MWT2 Gatekeeper located at University of Illinois @ Urbana-Champaign, IL
+    Description: MWT2 Gatekeeper located at University of Illinois @ Urbana-Champaign, IL
     FQDN: uiuc-gk.mwt2.org
     ID: 490
     Services:
@@ -379,8 +378,7 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-    Description:
-      MWT2 Gatekeeper located at University of Illinois @ Urbana-Champaign, IL
+    Description: MWT2 Gatekeeper located at University of Illinois @ Urbana-Champaign, IL
     FQDN: uiuc-gk02.mwt2.org
     ID: 1432
     Services:
@@ -431,8 +429,7 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-    Description:
-      MWT2 CVMFS Squid located at University of Illinois @ Urbana-Champaign, IL
+    Description: MWT2 CVMFS Squid located at University of Illinois @ Urbana-Champaign, IL
     FQDN: mwt2-cvmfs.campuscluster.illinois.edu
     ID: 914
     Services:
@@ -616,7 +613,7 @@ Resources:
           uri_override: iut2-slate01.mwt2.org:32200
           Monitored: true
     VOOwnership:
-      ATLAS: 100  
+      ATLAS: 100
   MWT2_SLATE_UIUC:
     Active: true
     ContactLists:
@@ -668,8 +665,8 @@ Resources:
           ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97
           Name: Lincoln Bryant
         Tertiary:
-          ID: 3c60d9a835029389712c5f6cc30720bc5562519d
-          Name: David Jordan
+          ID: OSG1000064
+          Name: Ilija Vukotic
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
@@ -681,8 +678,8 @@ Resources:
           ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97
           Name: Lincoln Bryant
         Tertiary:
-          ID: 3c60d9a835029389712c5f6cc30720bc5562519d
-          Name: David Jordan
+          ID: OSG1000064
+          Name: Ilija Vukotic
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
@@ -706,8 +703,8 @@ Resources:
           ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97
           Name: Lincoln Bryant
         Tertiary:
-          ID: 3c60d9a835029389712c5f6cc30720bc5562519d
-          Name: David Jordan
+          ID: OSG1000064
+          Name: Ilija Vukotic
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
@@ -719,8 +716,8 @@ Resources:
           ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97
           Name: Lincoln Bryant
         Tertiary:
-          ID: 3c60d9a835029389712c5f6cc30720bc5562519d
-          Name: David Jordan
+          ID: OSG1000064
+          Name: Ilija Vukotic
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
@@ -746,11 +743,8 @@ Resources:
           ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97
           Name: Lincoln Bryant
         Tertiary:
-          ID: 3c60d9a835029389712c5f6cc30720bc5562519d
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+          ID: OSG1000064
+          Name: Ilija Vukotic
       Security Contact:
         Primary:
           ID: a418fbc5dd33637bba264c01d84d52dd317f2813
@@ -759,11 +753,8 @@ Resources:
           ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97
           Name: Lincoln Bryant
         Tertiary:
-          ID: 3c60d9a835029389712c5f6cc30720bc5562519d
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+          ID: OSG1000064
+          Name: Ilija Vukotic
     Description: Varnish cache located at Starlight, Chicago, IL
     FQDN: igrok-chcg.pacificwave.net
     Services:

diff --git a/topology/University of Michigan/AGLT2/AGLT2.yaml b/topology/University of Michigan/AGLT2/AGLT2.yaml
@@ -175,8 +175,8 @@ Resources:
     ContactLists:
       Administrative Contact:
         Primary:
-          ID: 737e25f3cb6a16c6c1846ee2601b5e5b102bc157
-          Name: Wenjing Wu
+          ID: OSG1000064
+          Name: Ilija Vukotic
         Secondary:
           ID: fe2ecaf4ad4a0923d1be605ad55a8ca71f67eb66
           Name: Philippe Laurens
@@ -185,8 +185,8 @@ Resources:
           Name: Shawn McKee
       Security Contact:
         Primary:
-          ID: 737e25f3cb6a16c6c1846ee2601b5e5b102bc157
-          Name: Wenjing Wu
+          ID: OSG1000064
+          Name: Ilija Vukotic
         Secondary:
           ID: fe2ecaf4ad4a0923d1be605ad55a8ca71f67eb66
           Name: Philippe Laurens