Merge branch 'master' into patch-9

opensciencegrid · Oct 15, 2019 · a64adf2 · a64adf2
2 parents fdaad42 + 32f8b22
commit a64adf2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 66 deletions.
diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS-OPP.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS-OPP.yaml
@@ -7,28 +7,16 @@ Resources:
     ContactLists:
       Administrative Contact:
         Primary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
-        Secondary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
           Name: Xin Zhao
       Miscellaneous Contact:
         Primary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
-        Secondary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
           Name: Xin Zhao
       Resource Report Contact:
         Primary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
-        Secondary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
           Name: Xin Zhao
-        Tertiary:
-          ID: 1b078933a07113c75a73f7bc85e67ddbd64b764e
-          Name: Jose Caballero
       Security Contact:
         Primary:
           Name: BNL Atlas Tier 1 support

diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml
@@ -9,9 +9,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
@@ -50,9 +47,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
@@ -90,9 +84,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
@@ -131,16 +122,10 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
           Name: Xin Zhao
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Security Contact:
         Primary:
           Name: BNL Atlas Tier 1 support
@@ -175,9 +160,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
@@ -216,16 +198,10 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
           Name: Xin Zhao
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Security Contact:
         Primary:
           Name: BNL Atlas Tier 1 support
@@ -261,9 +237,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Resource Report Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
@@ -323,9 +296,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Miscellaneous Contact:
         Primary:
           ID: cd664fe4b3ce5a2b429ddd41c8877f9ca030800b
@@ -448,9 +418,6 @@ Resources:
         Primary:
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
           Name: BNL Atlas Tier 1 support
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Miscellaneous Contact:
         Primary:
           ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
@@ -459,16 +426,10 @@ Resources:
         Primary:
           ID: cd664fe4b3ce5a2b429ddd41c8877f9ca030800b
           Name: Hironori Ito
-        Tertiary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
       Security Contact:
         Primary:
           Name: BNL Atlas Tier 1 support
           ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
-        Secondary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
     Description: SE at Amazon West-2 region.
     FQDN: bestse03.usatlas.bnl.gov
     ID: 826

diff --git a/topology/Brookhaven National Laboratory/BNL-SDCC/BNL-SDCC.yaml b/topology/Brookhaven National Laboratory/BNL-SDCC/BNL-SDCC.yaml
@@ -10,13 +10,13 @@ Resources:
     ContactLists:
       Administrative Contact:
         Primary:
-          Name: John Hover
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
+          ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
+          Name: Xin Zhao
 
       Security Contact:
         Primary:
-          Name: John Hover
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
+          ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe
+          Name: Xin Zhao
     FQDN: spce01.sdcc.bnl.gov
     Services:
       CE:

diff --git a/topology/Brookhaven National Laboratory/Brookhaven Belle-II Tier1/BNL-Belle-II.yaml b/topology/Brookhaven National Laboratory/Brookhaven Belle-II Tier1/BNL-Belle-II.yaml
@@ -25,9 +25,6 @@ Resources:
           Name: Hironori Ito
       Security Contact:
         Primary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
-        Secondary:
           ID: cd664fe4b3ce5a2b429ddd41c8877f9ca030800b
           Name: Hironori Ito
     Description: This is the HTCondor-CE for Belle II  at the Belle-II T1 center at
@@ -65,9 +62,6 @@ Resources:
           Name: Hironori Ito
       Security Contact:
         Primary:
-          ID: fa0ca5484e97c3caa3a2fb59217caa70e8b3d66d
-          Name: John Hover
-        Secondary:
           ID: cd664fe4b3ce5a2b429ddd41c8877f9ca030800b
           Name: Hironori Ito
       Submitter Contact:

diff --git a/virtual-organizations/MIS.yaml b/virtual-organizations/MIS.yaml
@@ -43,11 +43,6 @@ OASIS:
         Dykstra/CN=UID:dwd
       - /DC=org/DC=opensciencegrid/O=Open Science Grid/OU=People/CN=Dave Dykstra 508
       ID: 85fe79f7c8a447834460b6852f46d3eef32fb714
-    Jose Caballero:
-      DNs:
-      - /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=jcaballe/CN=620333/CN=Jose Caballero
-        Bejar
-      ID: 1b078933a07113c75a73f7bc85e67ddbd64b764e
     Matyas Selmeci:
       DNs:
         - /DC=org/DC=opensciencegrid/O=Open Science Grid/OU=People/CN=Matyas Selmeci