Merge branch 'master' into new_unr

template-SITE.yaml

@@ -3,10 +3,6 @@ LongName: University of XYZ Cluster
 # Description is a brief description of your site
 Description: Computer Science building of the University of XYZ
 
-# If you have an up-to-date local git clone, fill ID with the output from `bin/next_site_id`
-# Otherwise, leave it blank and we will fill in the appropriate value for you.
-ID: <ID>
-
 # AddressLine1 is the street address of the site
 AddressLine1: 1234 Fifth St
 ### AddressLine2 (optional) is the second line of the street address

template-resourcegroup.yaml

@@ -7,10 +7,6 @@ SupportCenter: <NAME>
 # GroupDescription is a long description of the resource group; may be multiple lines.
 GroupDescription: This is a cluster of <SOMETHING> used for the <PROJECT>
 
-# If you have an up-to-date local git clone, fill GroupID with the output from `bin/next_resource_group_id`
-# Otherwise, leave it blank and we will fill in the appropriate value for you.
-GroupID: <ID>
-
 # Resources contains one or more resources in this
 # ResourceGroup. A resource provides one or more services
 Resources:
@@ -23,9 +19,6 @@ Resources:
     Active: false
     # Description is a long description of the resource; may be multiple lines
     Description: This is a <RESOURCE> for <SITE>.
-    # If you have an up-to-date local git clone, fill ID with the output from `bin/next_resource_id`
-    # Otherwise, leave it blank and we will fill in the appropriate value for you.
-    ID: <ID>
     # 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:

template-virtual-organization.yaml

@@ -9,10 +9,6 @@ Community: The ATLAS physics community.
 
 CertificateOnly: false
 
-# If you have an up-to-date local git clone, fill ID with the output from `bin/next_virtual_organization_id`
-# Otherwise, leave it blank and we will fill in the appropriate value for you.
-ID: <ID>
-
 # Contacts contain information about people to contact regarding this VO.
 # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml
 # If you cannot find the contact in the above XML, please register the contact:

topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml

@@ -0,0 +1,131 @@
+# Production is true if the resources in this group will join the production OSG pool,
+# and not the Integration Test Bed (ITB) pool.
+Production: true
+# SupportCenter is one of the support centers in topology/support-centers.yaml
+SupportCenter: Self Supported
+
+# GroupDescription is a long description of the resource group; may be multiple lines.
+GroupDescription: Albert Einstein Institute Hypatia Cluster
+
+# Resources contains one or more resources in this
+# ResourceGroup. A resource provides one or more services
+Resources:
+  # Resource Name should be a short descriptor of the resource.
+  # e.g. the Center for High Throughput Computing's GlideinWMS Frontend is "CHTC-glidein2"
+  # Resource Names need to be unique across all resources in the OSG.
+  AEI-Hypatia-CE1:
+    # Active is true if the resource is accepting requests, and false otherwise.
+    # When first registering a resource, set this to false. Set it to true when it's ready for production.
+    Active: false
+    # Description is a long description of the resource; may be multiple lines
+    Description: Hosted CE serving AEI-Hypatia
+    # 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: Steffan Grunewald
+        #   ID: <EMAIL HASH>
+        # Secondary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Tertiary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+
+    # FQDN is the fully qualified domain name of the host running this resource
+    FQDN: aei-hypatia-ce1-inactive.svc.opensciencegrid.org
+    ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed
+    # FQDNAliases:
+    #   - <HOSTNAME1>
+    #   - <HOSTNAME2>
+
+    ### DN (optional except for XCache resources) is the DN of the host cert of the resource
+    # in OpenSSL 1.0 format (i.e. /DC=org/DC=incommon/C=US/...)
+    # DN: <DN>
+
+    # Services is one or more services provided by this resource;
+    # valid services are listed in topology/services.yaml with the format "<SERVICE NAME>: <ID>"
+    Services:
+      CE:
+        # Description is a brief description of the service
+        Description: Hosted CE
+        ### Details (optional)
+        # Details:
+        #   # hidden
+        #   hidden: false
+        #   ### uri_override (optional, use if your service is on some non-standard URL)
+        #   # uri_override: <HOST>:<PORT>
+        #   ### sam_uri (optional)
+        #   # sam_uri: htcondor://...
+        #   ### endpoint (for perfSONAR services)
+        #   # endpoint: <HOSTNAME>
+
+      # Other services if you have any
+      # <SERVICE NAME>:
+      # ...
+
+    ### Tags (optional) is a list of tags associated with the resource.
+    ### Include the tag "CC*" if applicable for a CC* CE.
+    #Tags:
+    #- CC*
+
+    ### VOOwnership (optional) is the percentage of the resource owned by one or more VOs.
+    ### If part of the resource is not owned by the VO, do not list it.
+    ### The total percentage cannot exceed 100.
+    # VOOwnership:
+    #   <VO1>: <PERCENT>
+    #   <VO2>: <PERCENT>
+
+    ### WLCGInformation (optional) is only for resources that are part of the WLCG
+    # WLCGInformation:
+    #   APELNormalFactor: 0.0
+    #   AccountingName: <name>
+    #   HEPSPEC: 0
+    #   InteropAccounting: true
+    #   InteropBDII: true
+    #   InteropMonitoring: true
+    #   KSI2KMax: 0
+    #   KSI2KMin: 0
+    #   StorageCapacityMax: 0
+    #   StorageCapacityMin: 0
+    #   TapeCapacity: 0
+
+  # Other resources if you have any...
+  # <RESOURCE NAME>:
+  # ...
+

topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml

@@ -0,0 +1,23 @@
+# LongName is the expanded name of the site
+LongName: Albert Einstein Institute
+# Description is a brief description of your site
+Description: Albert Einstein Institute
+
+# AddressLine1 is the street address of the site
+AddressLine1: Am Mühlenberg 1
+### AddressLine2 (optional) is the second line of the street address
+# AddressLine2: Room 101
+# City is the city the site is located in
+City: Potsdam
+
+# Country is the country the site is located in
+Country: Germany
+### State (optional) is the state or province the site is located in
+# State: Wisconsin
+### Zipcode (optional) is the zipcode/postal code of the site
+Zipcode: D-14476
+
+# Latitude is the latitude of the site (positive values are in the northern hemisphere)
+Latitude: 52.416389
+# Longitude is the longitude of the site (positive values are in the eastern hemisphere)
+Longitude: 12.969167

topology/Purdue University/Purdue CMS/Purdue.yaml

@@ -1,9 +1,9 @@
 GroupDescription: CMS tier 2 facility at Purdue University, West Lafayette, IN.
 GroupID: 393
-Production: false
+Production: true
 Resources:
   Purdue-Hadoop-CE:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:

virtual-organizations/UH.yaml

@@ -31,3 +31,10 @@ DataFederations:
           - ITC_OSDF_ORIGIN
         AllowedCaches:
           - ANY
+      - Path: /uhawaii/koa/public
+        Authorizations:
+          - PUBLIC
+        AllowedOrigins:
+          - KOASTORE_OSDF_ORIGIN
+        AllowedCaches:
+          - ANY