From 733a9d9bddcef77055be45dd283e280dd52fea7c Mon Sep 17 00:00:00 2001 From: Simon Delamare <simon.delamare@ens-lyon.fr> Date: Wed, 10 Jun 2020 11:33:29 +0200 Subject: [PATCH] [all_sites] Remove references to storage5k --- data/grid5000/sites/grenoble/grenoble.json | 1 - data/grid5000/sites/lille/lille.json | 1 - data/grid5000/sites/luxembourg/luxembourg.json | 1 - data/grid5000/sites/lyon/lyon.json | 1 - data/grid5000/sites/nancy/nancy.json | 1 - data/grid5000/sites/nantes/nantes.json | 1 - data/grid5000/sites/rennes/rennes.json | 1 - data/grid5000/sites/sophia/sophia.json | 1 - input/grid5000/sites/grenoble/grenoble.yaml | 1 - input/grid5000/sites/lille/lille.yaml | 1 - input/grid5000/sites/luxembourg/luxembourg.yaml | 1 - input/grid5000/sites/lyon/lyon.yaml | 1 - input/grid5000/sites/nancy/nancy.yaml | 1 - input/grid5000/sites/nantes/nantes.yaml | 1 - input/grid5000/sites/rennes/rennes.yaml | 1 - input/grid5000/sites/sophia/sophia.yaml | 1 - lib/refrepo/valid/input/schemas/schema-site.yaml | 1 - 17 files changed, 17 deletions(-) diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json index 1783d09db05..4e4e201463b 100644 --- a/data/grid5000/sites/grenoble/grenoble.json +++ b/data/grid5000/sites/grenoble/grenoble.json @@ -61,7 +61,6 @@ "production": true, "renater_ip": "192.168.4.15", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": false, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "grenoble", diff --git a/data/grid5000/sites/lille/lille.json b/data/grid5000/sites/lille/lille.json index a4a813dfe00..842c2a23241 100644 --- a/data/grid5000/sites/lille/lille.json +++ b/data/grid5000/sites/lille/lille.json @@ -61,7 +61,6 @@ "production": true, "renater_ip": "192.168.4.18", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": false, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "lille", diff --git a/data/grid5000/sites/luxembourg/luxembourg.json b/data/grid5000/sites/luxembourg/luxembourg.json index e5f46484001..69b82cb9c31 100644 --- a/data/grid5000/sites/luxembourg/luxembourg.json +++ b/data/grid5000/sites/luxembourg/luxembourg.json @@ -61,7 +61,6 @@ "production": true, "renater_ip": "192.168.4.21", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": false, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "luxembourg", diff --git a/data/grid5000/sites/lyon/lyon.json b/data/grid5000/sites/lyon/lyon.json index 41e70da20e6..6ab2db9f721 100644 --- a/data/grid5000/sites/lyon/lyon.json +++ b/data/grid5000/sites/lyon/lyon.json @@ -61,7 +61,6 @@ "production": true, "renater_ip": "192.168.4.13", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": true, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "lyon", diff --git a/data/grid5000/sites/nancy/nancy.json b/data/grid5000/sites/nancy/nancy.json index 9e9c7826ed5..b723583ef09 100644 --- a/data/grid5000/sites/nancy/nancy.json +++ b/data/grid5000/sites/nancy/nancy.json @@ -62,7 +62,6 @@ "production": true, "renater_ip": "192.168.4.14", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": false, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "nancy", diff --git a/data/grid5000/sites/nantes/nantes.json b/data/grid5000/sites/nantes/nantes.json index 6a15c2bd5a2..3f1e4126b38 100644 --- a/data/grid5000/sites/nantes/nantes.json +++ b/data/grid5000/sites/nantes/nantes.json @@ -61,7 +61,6 @@ "production": true, "renater_ip": "192.168.4.22", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": false, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "nantes", diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json index 469b43ead43..71b9544d659 100644 --- a/data/grid5000/sites/rennes/rennes.json +++ b/data/grid5000/sites/rennes/rennes.json @@ -61,7 +61,6 @@ "production": true, "renater_ip": "192.168.4.19", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": true, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "rennes", diff --git a/data/grid5000/sites/sophia/sophia.json b/data/grid5000/sites/sophia/sophia.json index f9a9addc229..28a8d1bee2b 100644 --- a/data/grid5000/sites/sophia/sophia.json +++ b/data/grid5000/sites/sophia/sophia.json @@ -62,7 +62,6 @@ "production": true, "renater_ip": "192.168.4.12", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": true, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "sophia", diff --git a/input/grid5000/sites/grenoble/grenoble.yaml b/input/grid5000/sites/grenoble/grenoble.yaml index 5fff6086d92..bdc9d134358 100644 --- a/input/grid5000/sites/grenoble/grenoble.yaml +++ b/input/grid5000/sites/grenoble/grenoble.yaml @@ -13,7 +13,6 @@ user_support_contact: support-staff@lists.grid5000.fr compilation_server: false virt_ip_range: 10.132.0.0/14 renater_ip: 192.168.4.15 -storage5k: false production: true frontend_ip: 172.16.31.101 g5ksubnet: diff --git a/input/grid5000/sites/lille/lille.yaml b/input/grid5000/sites/lille/lille.yaml index 0047d528c1d..e2380a8bf2a 100644 --- a/input/grid5000/sites/lille/lille.yaml +++ b/input/grid5000/sites/lille/lille.yaml @@ -12,7 +12,6 @@ compilation_server: false kavlan_ip_range: 10.8.0.0/14 virt_ip_range: 10.136.0.0/14 renater_ip: 192.168.4.18 -storage5k: false production: true frontend_ip: 172.16.47.106 diff --git a/input/grid5000/sites/luxembourg/luxembourg.yaml b/input/grid5000/sites/luxembourg/luxembourg.yaml index 5d9eb157ed4..d9bf319c59d 100644 --- a/input/grid5000/sites/luxembourg/luxembourg.yaml +++ b/input/grid5000/sites/luxembourg/luxembourg.yaml @@ -13,7 +13,6 @@ compilation_server: false kavlan_ip_range: 10.40.0.0/14 virt_ip_range: 10.172.0.0/14 renater_ip: 192.168.4.21 -storage5k: false production: true #queues: # - default diff --git a/input/grid5000/sites/lyon/lyon.yaml b/input/grid5000/sites/lyon/lyon.yaml index f202e0e4e96..cea7077f2a6 100644 --- a/input/grid5000/sites/lyon/lyon.yaml +++ b/input/grid5000/sites/lyon/lyon.yaml @@ -13,7 +13,6 @@ compilation_server: false kavlan_ip_range: 10.12.0.0/14 virt_ip_range: 10.140.0.0/14 renater_ip: 192.168.4.13 -storage5k: true production: true frontend_ip: 172.16.63.101 #queues: diff --git a/input/grid5000/sites/nancy/nancy.yaml b/input/grid5000/sites/nancy/nancy.yaml index b1bd45b3213..6434d6471b7 100644 --- a/input/grid5000/sites/nancy/nancy.yaml +++ b/input/grid5000/sites/nancy/nancy.yaml @@ -13,7 +13,6 @@ user_support_contact: support-staff@lists.grid5000.fr compilation_server: false virt_ip_range: 10.144.0.0/14 renater_ip: 192.168.4.14 -storage5k: false production: true frontend_ip: 172.16.79.101 diff --git a/input/grid5000/sites/nantes/nantes.yaml b/input/grid5000/sites/nantes/nantes.yaml index 87ed5efc215..d7ea4ce13ac 100644 --- a/input/grid5000/sites/nantes/nantes.yaml +++ b/input/grid5000/sites/nantes/nantes.yaml @@ -13,7 +13,6 @@ compilation_server: false kavlan_ip_range: 10.40.0.0/14 virt_ip_range: 10.176.0.0/14 renater_ip: 192.168.4.22 -storage5k: false production: true #queues: # - default diff --git a/input/grid5000/sites/rennes/rennes.yaml b/input/grid5000/sites/rennes/rennes.yaml index 15bec1860c3..7f2ada9950b 100644 --- a/input/grid5000/sites/rennes/rennes.yaml +++ b/input/grid5000/sites/rennes/rennes.yaml @@ -11,7 +11,6 @@ user_support_contact: support-staff@lists.grid5000.fr compilation_server: false virt_ip_range: 10.156.0.0/14 renater_ip: 192.168.4.19 -storage5k: true production: true frontend_ip: 172.16.111.106 diff --git a/input/grid5000/sites/sophia/sophia.yaml b/input/grid5000/sites/sophia/sophia.yaml index 68b5e6a6efc..961dd3106a5 100644 --- a/input/grid5000/sites/sophia/sophia.yaml +++ b/input/grid5000/sites/sophia/sophia.yaml @@ -11,7 +11,6 @@ user_support_contact: support-staff@lists.grid5000.fr compilation_server: false virt_ip_range: 10.164.0.0/14 renater_ip: 192.168.4.12 -storage5k: true production: true frontend_ip: 172.16.143.106 diff --git a/lib/refrepo/valid/input/schemas/schema-site.yaml b/lib/refrepo/valid/input/schemas/schema-site.yaml index d87dc60e41a..785965f7ee7 100644 --- a/lib/refrepo/valid/input/schemas/schema-site.yaml +++ b/lib/refrepo/valid/input/schemas/schema-site.yaml @@ -43,7 +43,6 @@ security_contact: email user_support_contact: email compilation_server: boolean virt_ip_range: string -storage5k: boolean production: boolean laptops: <optional_hash>: -- GitLab