diff --git a/data/grid5000/sites/nantes/servers/ceph0.json b/data/grid5000/sites/nantes/servers/ceph0.json deleted file mode 100644 index 10daf1259859dbdd8a464282503a922d1bf3020c..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nantes/servers/ceph0.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "alias": [ - "ceph-dashboard", - "grafana", - "alertmanager", - "prometheus", - "csod" - ], - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.207.10", - "mac": "34:17:eb:e6:4c:41" - }, - "default": { - "ip": "172.16.207.10", - "mac": "a0:36:9f:53:11:10" - } - }, - "serial": "4CL5842", - "type": "server", - "uid": "ceph0", - "warranty": "2019-12" -} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/servers/ceph1.json b/data/grid5000/sites/nantes/servers/ceph1.json deleted file mode 100644 index ebbe1944d047eb6fe07b727340d6e579aaecf1c3..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nantes/servers/ceph1.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "alias": [ - - ], - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.207.11", - "mac": "34:17:eb:e6:4a:6d" - }, - "default": { - "ip": "172.16.207.11", - "mac": "a0:36:9f:53:0b:ec" - } - }, - "serial": "GBL5842", - "type": "server", - "uid": "ceph1", - "warranty": "2019-12" -} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/servers/ceph2.json b/data/grid5000/sites/nantes/servers/ceph2.json deleted file mode 100644 index 9bc0cfd75a18716ec799a9f3354b84999ffec252..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nantes/servers/ceph2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "alias": [ - - ], - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.207.12", - "mac": "34:17:eb:e6:47:67" - }, - "default": { - "ip": "172.16.207.12", - "mac": "a0:36:9f:53:11:44" - } - }, - "serial": "1CL5842", - "type": "server", - "uid": "ceph2", - "warranty": "2019-12" -} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/servers/ceph3.json b/data/grid5000/sites/nantes/servers/ceph3.json deleted file mode 100644 index 60f08f059ea68a8122e614a551b20bb19b47807b..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nantes/servers/ceph3.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "alias": [ - - ], - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.207.13", - "mac": "34:17:eb:e6:4a:4c" - }, - "default": { - "ip": "172.16.207.13", - "mac": "a0:36:9f:53:11:40" - } - }, - "serial": "FBL5842", - "type": "server", - "uid": "ceph3", - "warranty": "2019-12" -} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/servers/srv-2.json b/data/grid5000/sites/nantes/servers/srv-2.json deleted file mode 100644 index c661b0b5562e73016c54c6b920725af257064726..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nantes/servers/srv-2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.207.3", - "mac": "78:45:c4:f9:2f:53" - }, - "default": { - "ip": "172.16.207.3", - "mac": "a0:36:9f:0e:a1:f0" - } - }, - "serial": "JP2YG5J", - "type": "server", - "uid": "srv-2", - "warranty": "2019-11" -} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/servers/srv.json b/data/grid5000/sites/nantes/servers/srv.json deleted file mode 100644 index ae4caffd864ff0b663f046a480ab5d31c959c8ea..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nantes/servers/srv.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.207.1", - "mac": "78:45:c4:f9:2c:b9" - }, - "default": { - "ip": "172.16.207.1", - "mac": "a0:36:9f:0e:24:58" - } - }, - "serial": "HP2YG5J", - "type": "server", - "uid": "srv", - "warranty": "2019-11" -} \ No newline at end of file diff --git a/input/grid5000/sites/nantes/servers/physical.yaml b/input/grid5000/sites/nantes/servers/physical.yaml index 2e4311e2828f56965358d9f7efafb6423dfda0d0..1d2ec2db8eca265f5e72674a1cca9425e1f9bec8 100644 --- a/input/grid5000/sites/nantes/servers/physical.yaml +++ b/input/grid5000/sites/nantes/servers/physical.yaml @@ -1,16 +1,4 @@ --- -srv: - kind: physical - warranty: 2019-11 - serial: HP2YG5J - network_adapters: - default: - ip: 172.16.207.1 - mac: a0:36:9f:0e:24:58 - bmc: - ip: 172.17.207.1 - mac: 78:45:c4:f9:2c:b9 - srv-data: kind: physical alias: [nfs, home-g5k, public, modules] @@ -24,18 +12,6 @@ srv-data: ip: 172.17.207.2 mac: 90:b1:1c:13:86:04 -srv-2: - kind: physical - warranty: 2019-11 - serial: JP2YG5J - network_adapters: - default: - ip: 172.16.207.3 - mac: a0:36:9f:0e:a1:f0 - bmc: - ip: 172.17.207.3 - mac: 78:45:c4:f9:2f:53 - srv-3: kind: physical alias: @@ -63,60 +39,3 @@ srv-4: bmc: ip: 172.17.207.5 mac: 4c:d9:8f:34:f9:f2 - -ceph0: - kind: physical - alias: - - ceph-dashboard - - grafana - - alertmanager - - prometheus - - csod - warranty: 2019-12 - serial: 4CL5842 - network_adapters: - default: - ip: 172.16.207.10 - mac: a0:36:9f:53:11:10 - bmc: - ip: 172.17.207.10 - mac: 34:17:eb:e6:4c:41 - -ceph1: - kind: physical - alias: [] - warranty: 2019-12 - serial: GBL5842 - network_adapters: - default: - ip: 172.16.207.11 - mac: a0:36:9f:53:0b:ec - bmc: - ip: 172.17.207.11 - mac: 34:17:eb:e6:4a:6d - -ceph2: - kind: physical - alias: [] - warranty: 2019-12 - serial: 1CL5842 - network_adapters: - default: - ip: 172.16.207.12 - mac: a0:36:9f:53:11:44 - bmc: - ip: 172.17.207.12 - mac: 34:17:eb:e6:47:67 - -ceph3: - kind: physical - alias: [] - warranty: 2019-12 - serial: FBL5842 - network_adapters: - default: - ip: 172.16.207.13 - mac: a0:36:9f:53:11:40 - bmc: - ip: 172.17.207.13 - mac: 34:17:eb:e6:4a:4c