From 06b38653e9183156f0e7ea4163e8efe62903cf74 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 2 Apr 2024 11:35:24 -0700 Subject: [PATCH 01/10] adding IN2P3 adding IN2P3 --- .../FACILITY.yaml | 1 + .../IN2P3-CC/IN2P3-OSDF.yaml | 27 +++++++++++++++++++ .../IN2P3-CC/SITE.yaml | 13 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 topology/Centre national de la recherche scientifique/FACILITY.yaml create mode 100644 topology/Centre national de la recherche scientifique/IN2P3-CC/IN2P3-OSDF.yaml create mode 100644 topology/Centre national de la recherche scientifique/IN2P3-CC/SITE.yaml diff --git a/topology/Centre national de la recherche scientifique/FACILITY.yaml b/topology/Centre national de la recherche scientifique/FACILITY.yaml new file mode 100644 index 000000000..23962c08a --- /dev/null +++ b/topology/Centre national de la recherche scientifique/FACILITY.yaml @@ -0,0 +1 @@ +ID: 10218 diff --git a/topology/Centre national de la recherche scientifique/IN2P3-CC/IN2P3-OSDF.yaml b/topology/Centre national de la recherche scientifique/IN2P3-CC/IN2P3-OSDF.yaml new file mode 100644 index 000000000..ffbdaa323 --- /dev/null +++ b/topology/Centre national de la recherche scientifique/IN2P3-CC/IN2P3-OSDF.yaml @@ -0,0 +1,27 @@ +Production: true +SupportCenter: IN2P3-CC +GroupDescription: IN2P3-CC caching infrastructure +GroupID: 1368 + +Resources: + IN2P3-CC_OSDF_CACHE: + Active: true + Description: IN2P3-CC cache + ID: 10371 + ContactLists: + Administrative Contact: + Primary: + Name: grid-admin@cc.in2p3.fr + ID: + Security Contact: + Primary: + Name: security@cc.in2p3.fr + ID: + DN: /DC=org/DC=terena/DC=tcs/C=FR/ST=Paris/O=Centre national de la recherche scientifique/CN=ccstashcache01.in2p3.fr + FQDN: ccstashcacheli01.in2p3.fr + Services: + XRootD origin server: + Description: StashCache cache server for IN2P3-CC + AllowedVOs: + - LIGO + - ANY_PUBLIC \ No newline at end of file diff --git a/topology/Centre national de la recherche scientifique/IN2P3-CC/SITE.yaml b/topology/Centre national de la recherche scientifique/IN2P3-CC/SITE.yaml new file mode 100644 index 000000000..1a5446f11 --- /dev/null +++ b/topology/Centre national de la recherche scientifique/IN2P3-CC/SITE.yaml @@ -0,0 +1,13 @@ +LongName: IN2P3-CC +Description: IN2P3-CC +ID: 10369 +AddressLine1: 21 avenue Pierre de Coubertin. +City: Villeurbanne +Country: France +LongName: IN2P3-CC +Description: IN2P3 Tier 1 +ID: xxx +Latitude: 45.78 +Longitude: 4.87 +State: Rhone-Alpes +Zipcode: 69100 \ No newline at end of file From 79f013893e6279cbc3139e3cf4791aa8411f840a Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:44:23 -0700 Subject: [PATCH 02/10] changing base name changing base name --- .../FACILITY.yaml | 0 .../IN2P3-CC/IN2P3-OSDF.yaml | 0 .../IN2P3-CC/SITE.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename topology/{Centre national de la recherche scientifique => IN2P3}/FACILITY.yaml (100%) rename topology/{Centre national de la recherche scientifique => IN2P3}/IN2P3-CC/IN2P3-OSDF.yaml (100%) rename topology/{Centre national de la recherche scientifique => IN2P3}/IN2P3-CC/SITE.yaml (100%) diff --git a/topology/Centre national de la recherche scientifique/FACILITY.yaml b/topology/IN2P3/FACILITY.yaml similarity index 100% rename from topology/Centre national de la recherche scientifique/FACILITY.yaml rename to topology/IN2P3/FACILITY.yaml diff --git a/topology/Centre national de la recherche scientifique/IN2P3-CC/IN2P3-OSDF.yaml b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml similarity index 100% rename from topology/Centre national de la recherche scientifique/IN2P3-CC/IN2P3-OSDF.yaml rename to topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml diff --git a/topology/Centre national de la recherche scientifique/IN2P3-CC/SITE.yaml b/topology/IN2P3/IN2P3-CC/SITE.yaml similarity index 100% rename from topology/Centre national de la recherche scientifique/IN2P3-CC/SITE.yaml rename to topology/IN2P3/IN2P3-CC/SITE.yaml From a9ec3ff5e7513e47ec2cbc933e88962adce34f14 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:56:50 -0700 Subject: [PATCH 03/10] Update topology/IN2P3/IN2P3-CC/SITE.yaml Co-authored-by: Brian Lin --- topology/IN2P3/IN2P3-CC/SITE.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/topology/IN2P3/IN2P3-CC/SITE.yaml b/topology/IN2P3/IN2P3-CC/SITE.yaml index 1a5446f11..768595231 100644 --- a/topology/IN2P3/IN2P3-CC/SITE.yaml +++ b/topology/IN2P3/IN2P3-CC/SITE.yaml @@ -6,7 +6,6 @@ City: Villeurbanne Country: France LongName: IN2P3-CC Description: IN2P3 Tier 1 -ID: xxx Latitude: 45.78 Longitude: 4.87 State: Rhone-Alpes From 4b8c604108dd50032b287b3aa47c57c9d99451ec Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:56:55 -0700 Subject: [PATCH 04/10] Update topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml Co-authored-by: Brian Lin --- topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml index ffbdaa323..3d0dc5f95 100644 --- a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml +++ b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml @@ -1,7 +1,6 @@ Production: true SupportCenter: IN2P3-CC GroupDescription: IN2P3-CC caching infrastructure -GroupID: 1368 Resources: IN2P3-CC_OSDF_CACHE: From 79a736e95622fdb7436fb4bc8368f00208f049de Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:57:00 -0700 Subject: [PATCH 05/10] Update topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml Co-authored-by: Brian Lin --- topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml index 3d0dc5f95..b8cc574ce 100644 --- a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml +++ b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml @@ -6,7 +6,6 @@ Resources: IN2P3-CC_OSDF_CACHE: Active: true Description: IN2P3-CC cache - ID: 10371 ContactLists: Administrative Contact: Primary: From 9cedd5610310e134c185b514947a42531289060c Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:57:29 -0700 Subject: [PATCH 06/10] Update topology/IN2P3/IN2P3-CC/SITE.yaml Co-authored-by: Brian Lin --- topology/IN2P3/IN2P3-CC/SITE.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/topology/IN2P3/IN2P3-CC/SITE.yaml b/topology/IN2P3/IN2P3-CC/SITE.yaml index 768595231..d4c60b9a3 100644 --- a/topology/IN2P3/IN2P3-CC/SITE.yaml +++ b/topology/IN2P3/IN2P3-CC/SITE.yaml @@ -1,6 +1,5 @@ LongName: IN2P3-CC Description: IN2P3-CC -ID: 10369 AddressLine1: 21 avenue Pierre de Coubertin. City: Villeurbanne Country: France From 4c8b38662040c5ef580326fe732988b2fa0de0be Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:58:26 -0700 Subject: [PATCH 07/10] delete FACILITY.yaml delete FACILITY.yaml --- topology/IN2P3/FACILITY.yaml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 topology/IN2P3/FACILITY.yaml diff --git a/topology/IN2P3/FACILITY.yaml b/topology/IN2P3/FACILITY.yaml deleted file mode 100644 index 23962c08a..000000000 --- a/topology/IN2P3/FACILITY.yaml +++ /dev/null @@ -1 +0,0 @@ -ID: 10218 From e4eaee20a7511f388d2548fee7d503a52086d240 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 4 Apr 2024 09:59:49 -0700 Subject: [PATCH 08/10] adding newlines adding newlines --- topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml | 3 ++- topology/IN2P3/IN2P3-CC/SITE.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml index b8cc574ce..2af0b530b 100644 --- a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml +++ b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml @@ -22,4 +22,5 @@ Resources: Description: StashCache cache server for IN2P3-CC AllowedVOs: - LIGO - - ANY_PUBLIC \ No newline at end of file + - ANY_PUBLIC + \ No newline at end of file diff --git a/topology/IN2P3/IN2P3-CC/SITE.yaml b/topology/IN2P3/IN2P3-CC/SITE.yaml index d4c60b9a3..0ea865fc5 100644 --- a/topology/IN2P3/IN2P3-CC/SITE.yaml +++ b/topology/IN2P3/IN2P3-CC/SITE.yaml @@ -8,4 +8,4 @@ Description: IN2P3 Tier 1 Latitude: 45.78 Longitude: 4.87 State: Rhone-Alpes -Zipcode: 69100 \ No newline at end of file +Zipcode: 69100 From baeba25eed0ee68d97d06a9392bc152ff6d42a9b Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 5 Apr 2024 13:04:11 -0500 Subject: [PATCH 09/10] Add IN2P3 Contact Details --- topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml index 2af0b530b..02ca570c3 100644 --- a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml +++ b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml @@ -9,12 +9,12 @@ Resources: ContactLists: Administrative Contact: Primary: - Name: grid-admin@cc.in2p3.fr - ID: + Name: IN2P3 Grid Admin + ID: 601b582450a036960907e05f3ee7b1bae995a806 Security Contact: Primary: - Name: security@cc.in2p3.fr - ID: + Name: IN2P3 Security + ID: 33fcdfcbfc32afbe7691bb90d29d1a48bcda8918 DN: /DC=org/DC=terena/DC=tcs/C=FR/ST=Paris/O=Centre national de la recherche scientifique/CN=ccstashcache01.in2p3.fr FQDN: ccstashcacheli01.in2p3.fr Services: From 39c45d66b739d479f8ab7b8e3cbb9d05e1612d66 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 5 Apr 2024 13:17:01 -0500 Subject: [PATCH 10/10] Update topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml --- topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml index 02ca570c3..935bb3047 100644 --- a/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml +++ b/topology/IN2P3/IN2P3-CC/IN2P3-OSDF.yaml @@ -1,5 +1,5 @@ Production: true -SupportCenter: IN2P3-CC +SupportCenter: Self Supported GroupDescription: IN2P3-CC caching infrastructure Resources: