Merge pull request #5173 from njpfnal/fermi_updates

Fermi Admin and machine updates for OSG Topology

Author: mwestphall

topology/Fermi National Accelerator Laboratory/FermiGrid/GPGRID.yaml

@@ -7,11 +7,11 @@ Resources:
     ContactLists:
       Administrative Contact:
         Primary:
-          ID: b087cec5fb6892ec5ee8ddd64ab2c4bcaaeb8fe1
-          Name: Farrukh Aftab Khan
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
         Secondary:
-          ID: f1b1a12174cd4760e9553c82004d38609f77c8e1
-          Name: Krista Majewski
+          ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
+          Name: Nicholas Peregonow
     Description: This is an HTCondor-CE that provides opportunistic access to GPGrid
     FQDN: gpce03.fnal.gov
     ID: 901
@@ -21,18 +21,19 @@ Resources:
         Details:
           hidden: false
     VOOwnership:
+      CMS: 0
       DUNE: 1
       Fermilab: 99
   FNAL_GPGRID_CE_04:
     Active: true
     ContactLists:
       Administrative Contact:
         Primary:
-          ID: b087cec5fb6892ec5ee8ddd64ab2c4bcaaeb8fe1
-          Name: Farrukh Aftab Khan
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
         Secondary:
-          ID: f1b1a12174cd4760e9553c82004d38609f77c8e1
-          Name: Krista Majewski
+          ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
+          Name: Nicholas Peregonow
     Description: This is an HTCondor-CE the directs jobs into GPGrid.
     FQDN: gpce04.fnal.gov
     ID: 902
@@ -42,6 +43,7 @@ Resources:
         Details:
           hidden: false
     VOOwnership:
+      CMS: 0
       DUNE: 1
       Fermilab: 99
   FNAL_JOBSUB_01:
@@ -52,8 +54,8 @@ Resources:
           ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
           Name: Nicholas Peregonow
         Secondary:
-          ID: b087cec5fb6892ec5ee8ddd64ab2c4bcaaeb8fe1
-          Name: Farrukh Aftab Khan
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
     Description: This is a Jobsub server that provides FIFE access to GPGrid
     FQDN: jobsub01.fnal.gov
     ID: 903
@@ -72,8 +74,8 @@ Resources:
           ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
           Name: Nicholas Peregonow
         Secondary:
-          ID: b087cec5fb6892ec5ee8ddd64ab2c4bcaaeb8fe1
-          Name: Farrukh Aftab Khan
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
     Description: This is a Jobsub server that provides FIFE access to GPGrid
     FQDN: jobsub02.fnal.gov
     ID: 904
@@ -84,4 +86,62 @@ Resources:
           hidden: false
     VOOwnership:
       Fermilab: 100
+  FNAL_JOBSUB_03:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
+          Name: Nicholas Peregonow
+        Secondary:
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
+    Description: This is a Jobsub server that provides FIFE access to GPGrid
+    FQDN: jobsub03.fnal.gov
+    Services:
+      Submit Node:
+        Description: OSG Submission Node
+        Details:
+          hidden: false
+    VOOwnership:
+      Fermilab: 100
+  FNAL_JOBSUB_04:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
+          Name: Nicholas Peregonow
+        Secondary:
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
+    Description: This is a Jobsub server that provides FIFE access to GPGrid
+    FQDN: jobsub04.fnal.gov
+    Services:
+      Submit Node:
+        Description: OSG Submission Node
+        Details:
+          hidden: false
+    VOOwnership:
+      Fermilab: 100
+  FNAL_JOBSUB_05:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 9e775c1738fe149d9afcb5ba4ceaaec1598fd117
+          Name: Nicholas Peregonow
+        Secondary:
+          ID: 888a771df50d76d5e229d97e37949dcca5af5b61
+          Name: Shreyas Bhat
+    Description: This is a Jobsub server that provides FIFE access to GPGrid
+    FQDN: jobsub05.fnal.gov
+    Services:
+      Submit Node:
+        Description: OSG Submission Node
+        Details:
+          hidden: false
+    VOOwnership:
+      Fermilab: 100
+
 SupportCenter: Fermilab