From a722237dd266e0be99ad1c8bf782e9562dba401e Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Wed, 12 Dec 2018 18:32:21 +0100
Subject: [PATCH] minor fixes to sites descriptions
---
data/grid5000/sites/nancy/nancy.json | 2 +-
input/grid5000/sites/grenoble/grenoble.yaml | 7 +------
input/grid5000/sites/nancy/nancy.yaml | 2 +-
input/grid5000/sites/sophia/sophia.yaml | 5 ++---
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/data/grid5000/sites/nancy/nancy.json b/data/grid5000/sites/nancy/nancy.json
index 56e7e7ec9d9..bf743e38865 100644
--- a/data/grid5000/sites/nancy/nancy.json
+++ b/data/grid5000/sites/nancy/nancy.json
@@ -68,5 +68,5 @@
"uid": "nancy",
"user_support_contact": "support-staff@lists.grid5000.fr",
"virt_ip_range": "10.144.0.0/14",
- "web": "http://www.loria.fr"
+ "web": "http://www.grid5000.fr/mediawiki/index.php/Nancy:Home"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/grenoble.yaml b/input/grid5000/sites/grenoble/grenoble.yaml
index 351ff920102..45bff80bafd 100644
--- a/input/grid5000/sites/grenoble/grenoble.yaml
+++ b/input/grid5000/sites/grenoble/grenoble.yaml
@@ -11,20 +11,15 @@ sys_admin_contact: support-staff@lists.grid5000.fr
security_contact: support-staff@lists.grid5000.fr
user_support_contact: support-staff@lists.grid5000.fr
compilation_server: false
-kavlan_ip_range: 10.4.0.0/14
virt_ip_range: 10.132.0.0/14
renater_ip: 192.168.4.15
storage5k: false
-#queues:
-# - default
-# - admin
production: true
frontend_ip: 172.16.31.101
-
g5ksubnet:
network: 10.132.0.0/14
gateway: 10.135.255.254
-
+kavlan_ip_range: 10.4.0.0/14
kavlans:
default:
network: 172.16.16.0/20
diff --git a/input/grid5000/sites/nancy/nancy.yaml b/input/grid5000/sites/nancy/nancy.yaml
index c25451c426b..da134874c56 100644
--- a/input/grid5000/sites/nancy/nancy.yaml
+++ b/input/grid5000/sites/nancy/nancy.yaml
@@ -2,7 +2,7 @@
# Site description
name: Nancy
location: Nancy, France
-web: http://www.loria.fr
+web: http://www.grid5000.fr/mediawiki/index.php/Nancy:Home
description: Grid5000 Nancy site
latitude: 48.7000
longitude: 6.2000
diff --git a/input/grid5000/sites/sophia/sophia.yaml b/input/grid5000/sites/sophia/sophia.yaml
index 42ea590b7f9..68b5e6a6efc 100644
--- a/input/grid5000/sites/sophia/sophia.yaml
+++ b/input/grid5000/sites/sophia/sophia.yaml
@@ -9,8 +9,6 @@ sys_admin_contact: support-staff@lists.grid5000.fr
security_contact: support-staff@lists.grid5000.fr
user_support_contact: support-staff@lists.grid5000.fr
compilation_server: false
-kavlan_ip_range: 10.32.0.0/14
-kavlan_nef: 108
virt_ip_range: 10.164.0.0/14
renater_ip: 192.168.4.12
storage5k: true
@@ -20,7 +18,8 @@ frontend_ip: 172.16.143.106
g5ksubnet:
network: 10.164.0.0/14
gateway: 10.167.255.254
-
+kavlan_ip_range: 10.32.0.0/14
+kavlan_nef: 108
kavlans:
default:
network: 172.16.128.0/20
--
GitLab