From c9995689ed8d45c376297f2b8e3c0202cf24cd97 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 7 Nov 2023 11:55:15 -1000 Subject: [PATCH 1/7] Update UH.yaml Addition of Koa Store OSDF origin --- virtual-organizations/UH.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/virtual-organizations/UH.yaml b/virtual-organizations/UH.yaml index bc19efe3d..d757e213a 100644 --- a/virtual-organizations/UH.yaml +++ b/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 From 97a311756462720848b8e648853a274d806dc0e7 Mon Sep 17 00:00:00 2001 From: Colby Date: Tue, 7 Nov 2023 15:54:09 -0800 Subject: [PATCH 2/7] Add CE for hypatia cluster at AEI --- .../AEI-Hypatia.yaml | 138 ++++++++++++++++++ .../Albert Einstein Institute/SITE.yaml | 27 ++++ .../Albert Einstein Institute/FACILITY.yaml | 1 + 3 files changed, 166 insertions(+) create mode 100644 topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml create mode 100644 topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml create mode 100644 topology/Albert Einstein Institute/FACILITY.yaml diff --git a/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml b/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml new file mode 100644 index 000000000..b130f4f9e --- /dev/null +++ b/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml @@ -0,0 +1,138 @@ +# 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 + +# 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: + +# 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 + # 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: + # 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: + # ID: + # Tertiary: + # Name: + # ID: + + # 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: + # ID: + # Tertiary: + # Name: + # ID: + + # 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: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # 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: + # - + # - + + ### 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: + + # Services is one or more services provided by this resource; + # valid services are listed in topology/services.yaml with the format ": " + 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: : + # ### sam_uri (optional) + # # sam_uri: htcondor://... + # ### endpoint (for perfSONAR services) + # # endpoint: + + # Other services if you have any + # : + # ... + + ### 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: + # : + # : + + ### WLCGInformation (optional) is only for resources that are part of the WLCG + # WLCGInformation: + # APELNormalFactor: 0.0 + # AccountingName: + # HEPSPEC: 0 + # InteropAccounting: true + # InteropBDII: true + # InteropMonitoring: true + # KSI2KMax: 0 + # KSI2KMin: 0 + # StorageCapacityMax: 0 + # StorageCapacityMin: 0 + # TapeCapacity: 0 + + # Other resources if you have any... + # : + # ... + diff --git a/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml b/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml new file mode 100644 index 000000000..3734fcdcc --- /dev/null +++ b/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml @@ -0,0 +1,27 @@ +# LongName is the expanded name of the site +LongName: Albert Einstein Institute +# Description is a brief description of your site +Description: Albert Einstein Institute + +# 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: + +# 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 diff --git a/topology/Albert Einstein Institute/FACILITY.yaml b/topology/Albert Einstein Institute/FACILITY.yaml new file mode 100644 index 000000000..d7f61dde4 --- /dev/null +++ b/topology/Albert Einstein Institute/FACILITY.yaml @@ -0,0 +1 @@ +ID: From 7688ff091e9b0ab55d8911d4a52b490f7844f97d Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 9 Nov 2023 15:36:07 -0600 Subject: [PATCH 3/7] Delete GroupID/ID (no longer necessary) --- .../Albert Einstein Institute/AEI-Hypatia.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml b/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml index b130f4f9e..7b5b93388 100644 --- a/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml +++ b/topology/Albert Einstein Institute/Albert Einstein Institute/AEI-Hypatia.yaml @@ -7,10 +7,6 @@ SupportCenter: Self Supported # GroupDescription is a long description of the resource group; may be multiple lines. GroupDescription: Albert Einstein Institute Hypatia Cluster -# 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: - # 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: Hosted CE serving AEI-Hypatia - # 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: # 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: From d8d2d34edf43436118e302f7d16a0519e6eb07be Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 9 Nov 2023 15:36:56 -0600 Subject: [PATCH 4/7] Drop site ID (no longer necessary) --- .../Albert Einstein Institute/SITE.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml b/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml index 3734fcdcc..f0efd2efb 100644 --- a/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml +++ b/topology/Albert Einstein Institute/Albert Einstein Institute/SITE.yaml @@ -3,10 +3,6 @@ LongName: Albert Einstein Institute # Description is a brief description of your site Description: Albert Einstein Institute -# 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: - # AddressLine1 is the street address of the site AddressLine1: Am Mühlenberg 1 ### AddressLine2 (optional) is the second line of the street address From 2ad711325bc7176fa8cc10953b16936107dbcaad Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 9 Nov 2023 15:37:13 -0600 Subject: [PATCH 5/7] Delete topology/Albert Einstein Institute/FACILITY.yaml - no longer necessary --- topology/Albert Einstein Institute/FACILITY.yaml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 topology/Albert Einstein Institute/FACILITY.yaml diff --git a/topology/Albert Einstein Institute/FACILITY.yaml b/topology/Albert Einstein Institute/FACILITY.yaml deleted file mode 100644 index d7f61dde4..000000000 --- a/topology/Albert Einstein Institute/FACILITY.yaml +++ /dev/null @@ -1 +0,0 @@ -ID: From 4a032e567beb868a0dc2cdc03e34c94043abc92e Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 9 Nov 2023 15:41:52 -0600 Subject: [PATCH 6/7] Drop IDs from templates -- we don't need them anymore --- template-SITE.yaml | 4 ---- template-resourcegroup.yaml | 7 ------- template-virtual-organization.yaml | 4 ---- 3 files changed, 15 deletions(-) diff --git a/template-SITE.yaml b/template-SITE.yaml index b36980134..fb0808424 100644 --- a/template-SITE.yaml +++ b/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: - # AddressLine1 is the street address of the site AddressLine1: 1234 Fifth St ### AddressLine2 (optional) is the second line of the street address diff --git a/template-resourcegroup.yaml b/template-resourcegroup.yaml index a9f51a54f..83207ee79 100644 --- a/template-resourcegroup.yaml +++ b/template-resourcegroup.yaml @@ -7,10 +7,6 @@ SupportCenter: # GroupDescription is a long description of the resource group; may be multiple lines. GroupDescription: This is a cluster of used for the -# 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: - # 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 for . - # 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: # 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: diff --git a/template-virtual-organization.yaml b/template-virtual-organization.yaml index 13ba71364..6cc5bdb7f 100644 --- a/template-virtual-organization.yaml +++ b/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: - # 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: From 2b92aa34792601e801a3b8e7a8e96c613cdc4152 Mon Sep 17 00:00:00 2001 From: smithnp <60900055+smithnp@users.noreply.github.com> Date: Fri, 10 Nov 2023 08:49:18 -0500 Subject: [PATCH 7/7] correct typo I believe I set the wrong attribute to false in my previous edit. Possibly causing issue with our squids showing up as registered. --- topology/Purdue University/Purdue CMS/Purdue.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Purdue University/Purdue CMS/Purdue.yaml b/topology/Purdue University/Purdue CMS/Purdue.yaml index 256d8028a..475a9b5f9 100644 --- a/topology/Purdue University/Purdue CMS/Purdue.yaml +++ b/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: