Skip to content

GitLab

Commit 098891c1 authored by Elodie Bertoncello's avatar Elodie Bertoncello
Browse files

Merge branch 'master' of ssh://git.grid5000.fr/srv/git/repos/reference-repository

parents 96aa76d7 ea7510f9
Hide whitespace changes
Inline Side-by-side
data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json
View file @ 098891c1
......@@ -35,7 +35,7 @@
"interface": "Ethernet",
"ip": "172.16.50.1",
"ip6": "fe80::a236:9fff:fe08:fa54",
"mac": "A0:36:9F:08:FA:54",
"mac": "a0:36:9f:08:fa:54",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": true,
......@@ -52,7 +52,7 @@
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
"mac": "A0:36:9F:08:FA:56",
"mac": "a0:36:9f:08:fa:56",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": false,
......@@ -66,7 +66,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:9C",
"mac": "bc:30:5b:ef:25:9c",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -80,7 +80,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:9D",
"mac": "bc:30:5b:ef:25:9d",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -94,7 +94,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:9E",
"mac": "bc:30:5b:ef:25:9e",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -108,7 +108,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:9F",
"mac": "bc:30:5b:ef:25:9f",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -121,7 +121,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.50.1",
"mac": "D4:BE:D9:F3:BF:9E",
"mac": "d4:be:d9:f3:bf:9e",
"management": true,
"mountable": false,
"mounted": false,
......
data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json
View file @ 098891c1
......@@ -35,7 +35,7 @@
"interface": "Ethernet",
"ip": "172.16.50.2",
"ip6": "fe80::a236:9fff:fe08:f6b8",
"mac": "A0:36:9F:08:F6:B8",
"mac": "a0:36:9f:08:f6:b8",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": true,
......@@ -52,7 +52,7 @@
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
"mac": "A0:36:9F:08:F6:BA",
"mac": "a0:36:9f:08:f6:ba",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": false,
......@@ -66,7 +66,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:23:58",
"mac": "bc:30:5b:ef:23:58",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -80,7 +80,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:23:59",
"mac": "bc:30:5b:ef:23:59",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -94,7 +94,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:23:5A",
"mac": "bc:30:5b:ef:23:5a",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -108,7 +108,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:23:5B",
"mac": "bc:30:5b:ef:23:5b",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -121,7 +121,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.50.2",
"mac": "D4:BE:D9:F9:A3:28",
"mac": "d4:be:d9:f9:a3:28",
"management": true,
"mountable": false,
"mounted": false,
......
data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json
View file @ 098891c1
......@@ -35,7 +35,7 @@
"interface": "Ethernet",
"ip": "172.16.50.3",
"ip6": "fe80::a236:9fff:fe08:fa44",
"mac": "A0:36:9F:08:FA:44",
"mac": "a0:36:9f:08:fa:44",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": true,
......@@ -52,7 +52,7 @@
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
"mac": "A0:36:9F:08:FA:46",
"mac": "a0:36:9f:08:fa:46",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": false,
......@@ -66,7 +66,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:2C:3C",
"mac": "bc:30:5b:ef:2c:3c",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -80,7 +80,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:2C:3D",
"mac": "bc:30:5b:ef:2c:3d",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -94,7 +94,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:2C:3E",
"mac": "bc:30:5b:ef:2c:3e",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -108,7 +108,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:2C:3F",
"mac": "bc:30:5b:ef:2c:3f",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -121,7 +121,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.50.3",
"mac": "D4:BE:D9:F9:A3:24",
"mac": "d4:be:d9:f9:a3:24",
"management": true,
"mountable": false,
"mounted": false,
......
data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json
View file @ 098891c1
......@@ -35,7 +35,7 @@
"interface": "Ethernet",
"ip": "172.16.50.4",
"ip6": "fe80::a236:9fff:fe08:f8c0",
"mac": "A0:36:9F:08:F8:C0",
"mac": "a0:36:9f:08:f8:c0",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": true,
......@@ -52,7 +52,7 @@
"driver": "ixgbe",
"enabled": false,
"interface": "Ethernet",
"mac": "A0:36:9F:08:F8:C2",
"mac": "a0:36:9f:08:f8:c2",
"management": false,
"model": "Intel X520 DP 10Gb DA/SFP+ Server Adapter",
"mountable": false,
......@@ -66,7 +66,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:5C",
"mac": "bc:30:5b:ef:25:5c",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -80,7 +80,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:5D",
"mac": "bc:30:5b:ef:25:5d",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -94,7 +94,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:5E",
"mac": "bc:30:5b:ef:25:5e",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -108,7 +108,7 @@
"driver": "igb",
"enabled": false,
"interface": "Ethernet",
"mac": "BC:30:5B:EF:25:5F",
"mac": "bc:30:5b:ef:25:5f",
"management": false,
"model": "Intel Ethernet I350 QP 1Gb",
"mountable": false,
......@@ -121,7 +121,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.50.4",
"mac": "D4:BE:D9:F5:EA:E2",
"mac": "d4:be:d9:f5:ea:e2",
"management": true,
"mountable": false,
"mounted": false,
......
data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json
View file @ 098891c1
......@@ -2,7 +2,7 @@
"architecture": {
"platform_type": "x86_64",
"smp_size": 2,
"smt_size": 24
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
View file @ 098891c1
......@@ -59,7 +59,7 @@
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
"guid": null,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:59",
"hwid": "0xC90300027F58",
"ib_switch_card": "0x000b8cffff003106",
"ib_switch_card_pos": 10,
......@@ -79,7 +79,7 @@
"device": "ib1",
"driver": "mlx4_core",
"enabled": false,
"guid": null,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:5a",
"interface": "InfiniBand",
"management": false,
"mountable": false,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
View file @ 098891c1
......@@ -47,7 +47,7 @@
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
"mac": "00:e0:81:b2:bf:cd",
"mac": "00:e0:81:b2:bf:c3",
"management": false,
"mountable": false,
"mounted": false,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
View file @ 098891c1
......@@ -65,7 +65,7 @@
"ib_switch_card_pos": 5,
"interface": "InfiniBand",
"ip": "172.18.65.24",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:3:2fd7",
"management": false,
"mountable": true,
"mounted": true,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
View file @ 098891c1
......@@ -47,7 +47,7 @@
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
"mac": "00:e0:81:b2:c0:e6",
"mac": "00:e0:81:b2:c0:5f",
"management": false,
"mountable": false,
"mounted": false,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
View file @ 098891c1
......@@ -65,7 +65,7 @@
"ib_switch_card_pos": 10,
"interface": "InfiniBand",
"ip": "172.18.65.29",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:3:3043",
"management": false,
"mountable": true,
"mounted": true,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
View file @ 098891c1
......@@ -65,7 +65,7 @@
"ib_switch_card_pos": 3,
"interface": "InfiniBand",
"ip": "172.18.65.44",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:2:80d5",
"management": false,
"mountable": true,
"mounted": true,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
View file @ 098891c1
......@@ -47,7 +47,7 @@
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
"mac": "00:e0:81:b1:c4:e8",
"mac": "00:e0:81:b1:c4:7f",
"management": false,
"mountable": false,
"mounted": false,
......@@ -65,7 +65,7 @@
"ib_switch_card_pos": 6,
"interface": "InfiniBand",
"ip": "172.18.65.6",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:2:80ad",
"management": false,
"mountable": true,
"mounted": true,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
View file @ 098891c1
......@@ -65,10 +65,10 @@
"ib_switch_card_pos": 3,
"interface": "InfiniBand",
"ip": "172.18.65.69",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:3:17b1",
"management": false,
"mountable": true,
"mounted": false,
"mounted": true,
"network_address": "griffon-69-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgriffonib",
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
View file @ 098891c1
......@@ -65,7 +65,7 @@
"ib_switch_card_pos": 9,
"interface": "InfiniBand",
"ip": "172.18.65.75",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:3:1875",
"management": false,
"mountable": true,
"mounted": true,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
View file @ 098891c1
......@@ -65,7 +65,7 @@
"ib_switch_card_pos": null,
"interface": "InfiniBand",
"ip": "172.18.65.82",
"ip6": "fe80::202:c903:2:8055",
"ip6": "fe80::202:c903:3:19f9",
"management": false,
"mountable": true,
"mounted": true,
......
data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
View file @ 098891c1
......@@ -84,7 +84,7 @@
"management": false,
"mountable": false,
"mounted": false,
"rate": 28000000000,
"rate": 8000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
......
generators/input/sites/lyon/clusters/orion_generated.yaml
View file @ 098891c1
......@@ -8,7 +8,7 @@ orion-1:
eth0:
mounted: true
rate: 10000000000
mac: A0:36:9F:08:FA:54
mac: a0:36:9f:08:fa:54
ip6: fe80::a236:9fff:fe08:fa54
management: false
enabled: true
......@@ -18,7 +18,7 @@ orion-1:
ip: 172.16.50.1
eth1:
mounted: false
mac: A0:36:9F:08:FA:56
mac: a0:36:9f:08:fa:56
management: false
enabled: false
interface: Ethernet
......@@ -26,7 +26,7 @@ orion-1:
mountable: false
eth2:
mounted: false
mac: BC:30:5B:EF:25:9C
mac: bc:30:5b:ef:25:9c
management: false
enabled: false
interface: Ethernet
......@@ -34,7 +34,7 @@ orion-1:
mountable: false
eth3:
mounted: false
mac: BC:30:5B:EF:25:9D
mac: bc:30:5b:ef:25:9d
management: false
enabled: false
interface: Ethernet
......@@ -42,7 +42,7 @@ orion-1:
mountable: false
eth4:
mounted: false
mac: BC:30:5B:EF:25:9E
mac: bc:30:5b:ef:25:9e
management: false
enabled: false
interface: Ethernet
......@@ -50,14 +50,14 @@ orion-1:
mountable: false
eth5:
mounted: false
mac: BC:30:5B:EF:25:9F
mac: bc:30:5b:ef:25:9f
management: false
enabled: false
interface: Ethernet
driver: igb
mountable: false
bmc:
mac: D4:BE:D9:F3:BF:9E
mac: d4:be:d9:f3:bf:9e
ip: 172.17.50.1
operating_system:
kernel: 2.6.32-5-amd64
......@@ -101,7 +101,7 @@ orion-2:
eth0:
mounted: true
rate: 10000000000
mac: A0:36:9F:08:F6:B8
mac: a0:36:9f:08:f6:b8
ip6: fe80::a236:9fff:fe08:f6b8
management: false
enabled: true
......@@ -111,7 +111,7 @@ orion-2:
ip: 172.16.50.2
eth1:
mounted: false
mac: A0:36:9F:08:F6:BA
mac: a0:36:9f:08:f6:ba
management: false
enabled: false
interface: Ethernet
......@@ -119,7 +119,7 @@ orion-2:
mountable: false
eth2:
mounted: false
mac: BC:30:5B:EF:23:58
mac: bc:30:5b:ef:23:58
management: false
enabled: false
interface: Ethernet
......@@ -127,7 +127,7 @@ orion-2:
mountable: false
eth3:
mounted: false
mac: BC:30:5B:EF:23:59
mac: bc:30:5b:ef:23:59
management: false
enabled: false
interface: Ethernet
......@@ -135,7 +135,7 @@ orion-2:
mountable: false
eth4:
mounted: false
mac: BC:30:5B:EF:23:5A
mac: bc:30:5b:ef:23:5a
management: false
enabled: false
interface: Ethernet
......@@ -143,14 +143,14 @@ orion-2:
mountable: false
eth5:
mounted: false
mac: BC:30:5B:EF:23:5B
mac: bc:30:5b:ef:23:5b
management: false
enabled: false
interface: Ethernet
driver: igb
mountable: false
bmc:
mac: D4:BE:D9:F9:A3:28
mac: d4:be:d9:f9:a3:28
ip: 172.17.50.2
operating_system:
kernel: 2.6.32-5-amd64
......@@ -204,7 +204,7 @@ orion-3:
eth0:
mounted: true
rate: 10000000000
mac: A0:36:9F:08:FA:44
mac: a0:36:9f:08:fa:44
ip6: fe80::a236:9fff:fe08:fa44
management: false
enabled: true
......@@ -214,7 +214,7 @@ orion-3:
ip: 172.16.50.3
eth1:
mounted: false
mac: A0:36:9F:08:FA:46
mac: a0:36:9f:08:fa:46
management: false
enabled: false
interface: Ethernet
......@@ -222,7 +222,7 @@ orion-3:
mountable: false
eth2:
mounted: false
mac: BC:30:5B:EF:2C:3C
mac: bc:30:5b:ef:2c:3c
management: false
enabled: false
interface: Ethernet
......@@ -230,7 +230,7 @@ orion-3:
mountable: false
eth3:
mounted: false
mac: BC:30:5B:EF:2C:3D
mac: bc:30:5b:ef:2c:3d
management: false
enabled: false
interface: Ethernet
......@@ -238,7 +238,7 @@ orion-3:
mountable: false
eth4:
mounted: false
mac: BC:30:5B:EF:2C:3E
mac: bc:30:5b:ef:2c:3e
management: false
enabled: false
interface: Ethernet
......@@ -246,14 +246,14 @@ orion-3:
mountable: false
eth5:
mounted: false
mac: BC:30:5B:EF:2C:3F
mac: bc:30:5b:ef:2c:3f
management: false
enabled: false
interface: Ethernet
driver: igb
mountable: false
bmc:
mac: D4:BE:D9:F9:A3:24
mac: d4:be:d9:f9:a3:24
ip: 172.17.50.3
chassis:
serial_number: C3MJD5J
......@@ -293,7 +293,7 @@ orion-4:
eth0:
mounted: true
rate: 10000000000
mac: A0:36:9F:08:F8:C0
mac: a0:36:9f:08:f8:c0
ip6: fe80::a236:9fff:fe08:f8c0
management: false
enabled: true
......@@ -303,7 +303,7 @@ orion-4:
ip: 172.16.50.4
eth1:
mounted: false
mac: A0:36:9F:08:F8:C2
mac: a0:36:9f:08:f8:c2
management: false
enabled: false
interface: Ethernet
......@@ -311,7 +311,7 @@ orion-4:
mountable: false
eth2:
mounted: false
mac: BC:30:5B:EF:25:5C
mac: bc:30:5b:ef:25:5c
management: false
enabled: false
interface: Ethernet
......@@ -319,7 +319,7 @@ orion-4:
mountable: false
eth3:
mounted: false
mac: BC:30:5B:EF:25:5D
mac: bc:30:5b:ef:25:5d
management: false