Merge branch 'master' into patch-1

topology/Michigan State University/MSU ICER/MSU-DataMachine.yaml

@@ -22,53 +22,37 @@ Resources:
     Active: true
     # Description is a long description of the resource; may be multiple lines
     Description: Hosted CE serving MSU
-    # ContactLists contain information about people to contact regarding this resource.
-    # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml
-    # If you cannot find the contact above XML, please register the contact:
-    # https://opensciencegrid.org/docs/common/registration/#registering-contacts
+
     ContactLists:
-      # Administrative Contacts are persons or groups of people (i.e.,
-      # mailing lists) that are directly responsible for the
-      # maintenance of the resource
       Administrative Contact:
         Primary:
           Name: Jeffrey Michael Dost
           ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba
-        # Secondary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
-        # Tertiary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
-
-      # Security Contact are persons or groups of people (i.e.,
-      # mailing lists) that are responsible for handling security
-      # issues related to the resource
       Security Contact:
         Primary:
           Name: Jeffrey Michael Dost
           ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba
-        # Secondary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
-        # Tertiary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
-
-      # Site contact (optional) are persons or groups of people (i.e.,
-      # mailing lists) that are generally responsible for a site's
-      # relationship with the OSG (e.g., principal investigators,
-      # local administrator contact for OSG Hosted CEs)
-      # Site Contact:
-        # Primary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
-        # Secondary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
-        # Tertiary:
-        #   Name: <FIRSTNAME> <LASTNAME>
-        #   ID: <EMAIL HASH>
+      Local Executive Contact:
+        Primary:
+          Name: Adam Pitcher
+          ID: OSG1000663
+        Secondary:
+          Name: Brian OShea
+          ID: OSG1000676
+      Local Operational Contact:
+        Primary:
+          Name: Thomas Holcomb
+          ID: OSG1000662
+        Secondary:
+          Name: Kelly Climer
+          ID: OSG1000672
+      Local Security Contact:
+        Primary:
+          Name: Thomas Holcomb
+          ID: OSG1000662
+        Secondary:
+          Name: Kelly Climer
+          ID: OSG1000672
 
     # FQDN is the fully qualified domain name of the host running this resource
     FQDN: msu-datamachine-ce1.svc.opensciencegrid.org