diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json index 1783d09db05f87eb1fc4d7253c8c067a713fdeb8..4e4e201463b4da89e3c5168b436793c7745929c6 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 a4a813dfe000573e616286a89db2a91a3145ea34..842c2a23241c35a4ed106d00c9f91734cf2819d4 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 e5f46484001239d2b37ec2192f2aae7239b21bf6..69b82cb9c31e87f43f0b53c0cb17e15a1bf612af 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 41e70da20e6526310f85d790b71cc81f659c963c..6ab2db9f721ca8a3a64a1f7c4cc4e9650a7eddca 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 9e9c7826ed574c710524fc3a6c40b6f66ac299b4..b723583ef09ee9f0286e564b44f210fec430ee69 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 6a15c2bd5a2aaaacbc9b962e1a1946aeffb71781..3f1e4126b3818dc445ce694203bfbdf796dcd42f 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 469b43ead431bf3a71d568153bf1c86bff3eff0a..71b9544d65927bbb327489910ac8e262c4f0b66a 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 f9a9addc22957be027e47c1ecb1fa0a51336205e..28a8d1bee2b49f3672fd0a05aa8497d7ac6cefff 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 5fff6086d924efea5fead450cef09ea654e2a560..bdc9d134358f6a50244590e57ba127c7ee651368 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 0047d528c1d971de052de84b1cd593b925a37a49..e2380a8bf2a9c825565f59f40f0983b7a29d02fd 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 5d9eb157ed46bf56324ea334ad5cda232afce88a..d9bf319c59d1e802089a91859a57f3fa900c8750 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 f202e0e4e96bf1c294fd269f3df20373b7b5888f..cea7077f2a64febf8aeb38415d9db2a8e2745f17 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 b1bd45b3213c176d049c3acd0add7e9794fa334c..6434d6471b7c1e1a33d3ba507064d62a87118cb1 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 87ed5efc2156b373be6fb068367dccbcf6224d64..d7ea4ce13ac3aa87d57bda4e5d170ba10b64fa44 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 15bec1860c36d3e65b91b62224a90fcc2ff287fa..7f2ada9950beb23b48b2744c944e4349ce14b12e 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 68b5e6a6efc192107e084dea3f8d90a065f60600..961dd3106a5c74b2e410e7ec2cc937d6d7865211 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 d87dc60e41acaadef63b43cfaf122dcdad62190d..785965f7ee7388d0bc01df806d3650086e3f787e 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>: