From 85fb391107a163a78d88fcef6ea32d31b5914e06 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 28 Jan 2020 09:21:44 +0100
Subject: [PATCH] [lyon] Remove castor & pollux dom0
---
.../lyon/network_equipments/force10.json | 8 +-----
data/grid5000/sites/lyon/servers/castor.json | 21 ---------------
data/grid5000/sites/lyon/servers/pollux.json | 21 ---------------
.../grid5000/sites/lyon/networks/force10.yaml | 6 -----
.../grid5000/sites/lyon/servers/servers.yaml | 26 -------------------
5 files changed, 1 insertion(+), 81 deletions(-)
delete mode 100644 data/grid5000/sites/lyon/servers/castor.json
delete mode 100644 data/grid5000/sites/lyon/servers/pollux.json
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index c1017411005..85a3b52164d 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -294,14 +294,8 @@
"uid": "nova-23"
},
{
- "kind": "server",
- "snmp_name": "TenGigabitEthernet 0/48",
- "uid": "castor"
},
{
- "kind": "server",
- "snmp_name": "TenGigabitEthernet 0/49",
- "uid": "pollux"
},
{
"kind": "server",
@@ -345,4 +339,4 @@
"type": "network_equipment",
"uid": "force10",
"warranty": "2017-07-01"
-}
\ No newline at end of file
+}
diff --git a/data/grid5000/sites/lyon/servers/castor.json b/data/grid5000/sites/lyon/servers/castor.json
deleted file mode 100644
index 7c4e0c26415..00000000000
--- a/data/grid5000/sites/lyon/servers/castor.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "alias": [
-
- ],
- "kind": "physical",
- "network_adapters": {
- "adm": {
- "ip": "172.17.63.1"
- },
- "bmc": {
- "ip": "172.17.62.1"
- },
- "default": {
- "ip": "172.16.63.1"
- }
- },
- "serial": "4T1JD5J",
- "type": "server",
- "uid": "castor",
- "warranty": "2017-07"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/servers/pollux.json b/data/grid5000/sites/lyon/servers/pollux.json
deleted file mode 100644
index e11eee24577..00000000000
--- a/data/grid5000/sites/lyon/servers/pollux.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "alias": [
-
- ],
- "kind": "physical",
- "network_adapters": {
- "adm": {
- "ip": "172.17.63.2"
- },
- "bmc": {
- "ip": "172.17.62.2"
- },
- "default": {
- "ip": "172.16.63.2"
- }
- },
- "serial": "3T1JD5J",
- "type": "server",
- "uid": "pollux",
- "warranty": "2017-07"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index bb8fcfb19fa..09fa625e800 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -71,12 +71,6 @@ force10:
45: nova-21
46: nova-22
47: nova-23
- 48:
- uid: castor
- kind: server
- 49:
- uid: pollux
- kind: server
50:
uid: procyon
kind: server
diff --git a/input/grid5000/sites/lyon/servers/servers.yaml b/input/grid5000/sites/lyon/servers/servers.yaml
index 9b72f18b2eb..79defd21c5c 100644
--- a/input/grid5000/sites/lyon/servers/servers.yaml
+++ b/input/grid5000/sites/lyon/servers/servers.yaml
@@ -11,32 +11,6 @@ cyrrus:
bmc:
ip: 172.17.62.3
-castor:
- kind: physical
- alias: []
- warranty: 2017-07
- serial: 4T1JD5J
- network_adapters:
- default:
- ip: 172.16.63.1
- adm:
- ip: 172.17.63.1
- bmc:
- ip: 172.17.62.1
-
-pollux:
- kind: physical
- alias: []
- warranty: 2017-07
- serial: 3T1JD5J
- network_adapters:
- default:
- ip: 172.16.63.2
- adm:
- ip: 172.17.63.2
- bmc:
- ip: 172.17.62.2
-
albireo-a:
kind: physical
alias: [srv1]
--
GitLab