From 84d2f0eb527f9daedf5981d2556e1286a5261ea9 Mon Sep 17 00:00:00 2001
From: Sebastien Philippot <sebastien.philippot@inria.fr>
Date: Fri, 22 Mar 2019 15:18:50 +0100
Subject: [PATCH] [luxembourg] storage5k:false and remove hera from
gw-luxembourg
---
data/grid5000/sites/luxembourg/luxembourg.json | 2 +-
.../luxembourg/network_equipments/gw-luxembourg.json | 6 ------
input/grid5000/sites/luxembourg/luxembourg.yaml | 2 +-
.../grid5000/sites/luxembourg/networks/gw-luxembourg.yaml | 8 --------
4 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/data/grid5000/sites/luxembourg/luxembourg.json b/data/grid5000/sites/luxembourg/luxembourg.json
index a9014d017a7..e5f46484001 100644
--- a/data/grid5000/sites/luxembourg/luxembourg.json
+++ b/data/grid5000/sites/luxembourg/luxembourg.json
@@ -61,7 +61,7 @@
"production": true,
"renater_ip": "192.168.4.21",
"security_contact": "support-staff@lists.grid5000.fr",
- "storage5k": true,
+ "storage5k": false,
"sys_admin_contact": "support-staff@lists.grid5000.fr",
"type": "site",
"uid": "luxembourg",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
index a55673fd585..c2b40161976 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
@@ -56,9 +56,6 @@
{
},
{
- "kind": "other",
- "port": "eth1",
- "uid": "hera"
},
{
},
@@ -293,9 +290,6 @@
{
},
{
- "kind": "other",
- "port": "eth0",
- "uid": "hera"
},
{
},
diff --git a/input/grid5000/sites/luxembourg/luxembourg.yaml b/input/grid5000/sites/luxembourg/luxembourg.yaml
index e76bc291600..5d9eb157ed4 100644
--- a/input/grid5000/sites/luxembourg/luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/luxembourg.yaml
@@ -13,7 +13,7 @@ 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: true
+storage5k: false
production: true
#queues:
# - default
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index 7217ba78b5a..72a74656af0 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -163,10 +163,6 @@ gw-luxembourg:
# uid: granduc-22
# port: bmc
# kind: node
- 23:
- uid: hera
- port: eth1
- kind: other
25:
uid: granduc-2
port: eth1
@@ -269,10 +265,6 @@ gw-luxembourg:
# uid: zeus
# port: bmc
# kind: other
- 46:
- uid: hera
- port: eth0
- kind: other
48:
3:
snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
--
GitLab