diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json index c10174110059c913d7e8492b1955800ad86ac280..85a3b52164df2902b340cea8e0c6d548126e03bb 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 7c4e0c2641522804d3c9e15b9cb5347bad9ef143..0000000000000000000000000000000000000000 --- 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 e11eee24577752cadd27077daaae923a23b17978..0000000000000000000000000000000000000000 --- 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 bb8fcfb19fa8a4f7955a2ccac184353f9165f8ce..09fa625e8001db7f1b4e7da891fc7a30e814d3a2 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 9b72f18b2eb5813a197e39448d027c89f0cb5406..79defd21c5c83fb1ad039db447d9953158a67bd0 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]