Commit 7614750f authored by Jérémie Gaidamour's avatar Jérémie Gaidamour

Merge branch 'master' of https://github.com/grid5000/reference-repository

Conflicts:
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
	data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
	input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
	input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
parents 4a3f9488 7904da7f
......@@ -85,6 +85,8 @@
"mounted": true,
"network_address": "graphene-73-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -97,6 +99,7 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -186,4 +189,4 @@
},
"type": "node",
"uid": "graphene-73"
}
\ No newline at end of file
}
......@@ -85,6 +85,11 @@
"mounted": true,
"network_address": "graphene-74-ib0.nancy.grid5000.fr",
"rate": 20000000000,
<<<<<<< HEAD
=======
"switch": "sgrapheneib",
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......@@ -97,6 +102,10 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
<<<<<<< HEAD
=======
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......
......@@ -85,6 +85,8 @@
"mounted": true,
"network_address": "graphene-75-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -97,6 +99,7 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -186,4 +189,4 @@
},
"type": "node",
"uid": "graphene-75"
}
\ No newline at end of file
}
......@@ -75,7 +75,11 @@
{
"device": "ib0",
"driver": "mlx4_core",
<<<<<<< HEAD
"enabled": false,
=======
"enabled": true,
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5",
"interface": "InfiniBand",
"ip": "172.18.64.76",
......@@ -84,6 +88,11 @@
"mounted": true,
"network_address": "graphene-76-ib0.nancy.grid5000.fr",
"rate": 10000000000,
<<<<<<< HEAD
=======
"switch": "sgrapheneib",
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......@@ -96,6 +105,10 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
<<<<<<< HEAD
=======
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......
......@@ -85,6 +85,8 @@
"mounted": true,
"network_address": "graphene-77-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -97,6 +99,7 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -186,4 +189,4 @@
},
"type": "node",
"uid": "graphene-77"
}
\ No newline at end of file
}
......@@ -85,6 +85,11 @@
"mounted": true,
"network_address": "graphene-78-ib0.nancy.grid5000.fr",
"rate": 20000000000,
<<<<<<< HEAD
=======
"switch": "sgrapheneib",
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......@@ -97,6 +102,10 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
<<<<<<< HEAD
=======
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......
......@@ -85,6 +85,8 @@
"mounted": true,
"network_address": "graphene-79-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -97,6 +99,7 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -186,4 +189,4 @@
},
"type": "node",
"uid": "graphene-79"
}
\ No newline at end of file
}
......@@ -75,7 +75,11 @@
{
"device": "ib0",
"driver": "mlx4_core",
<<<<<<< HEAD
"enabled": false,
=======
"enabled": true,
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1",
"interface": "InfiniBand",
"ip": "172.18.64.80",
......@@ -84,6 +88,11 @@
"mounted": true,
"network_address": "graphene-80-ib0.nancy.grid5000.fr",
"rate": 10000000000,
<<<<<<< HEAD
=======
"switch": "sgrapheneib",
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......@@ -96,6 +105,10 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
<<<<<<< HEAD
=======
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......
......@@ -72,6 +72,36 @@
"vendor": "intel",
"version": "82574L"
},
{
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9",
"interface": "InfiniBand",
"ip": "172.18.64.81",
"ip6": "fe80::202:c903:b:93a9",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "graphene-81-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
"device": "ib1",
"driver": "mlx4_core",
"enabled": false,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:aa",
"interface": "InfiniBand",
"management": false,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
"device": "bmc",
"enabled": true,
......
......@@ -72,6 +72,36 @@
"vendor": "intel",
"version": "82574L"
},
{
"device": "ib0",
"driver": "mlx4_core",
"enabled": true,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95",
"interface": "InfiniBand",
"ip": "172.18.64.82",
"ip6": "fe80::202:c903:b:9395",
"management": false,
"mountable": true,
"mounted": true,
"network_address": "graphene-82-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
"device": "ib1",
"driver": "mlx4_core",
"enabled": false,
"guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96",
"interface": "InfiniBand",
"management": false,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
"device": "bmc",
"enabled": true,
......
......@@ -85,6 +85,8 @@
"mounted": true,
"network_address": "graphene-83-ib0.nancy.grid5000.fr",
"rate": 20000000000,
"switch": "sgrapheneib",
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -97,6 +99,7 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
"vendor": "Mellanox",
"version": "MT26418"
},
{
......@@ -186,4 +189,4 @@
},
"type": "node",
"uid": "graphene-83"
}
\ No newline at end of file
}
......@@ -85,6 +85,11 @@
"mounted": true,
"network_address": "graphene-84-ib0.nancy.grid5000.fr",
"rate": 20000000000,
<<<<<<< HEAD
=======
"switch": "sgrapheneib",
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......@@ -97,6 +102,10 @@
"mountable": false,
"mounted": false,
"rate": 10000000000,
<<<<<<< HEAD
=======
"vendor": "Mellanox",
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
"version": "MT26418"
},
{
......
......@@ -122,7 +122,7 @@
"cache_l2": 262144,
"cache_l3": 15728640,
"clock_speed": 1600000000,
"ht_capable": false,
"ht_capable": true,
"instruction_set": "x86-64",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) CPU E5-2603 v3 @ 1.60GHz",
......
......@@ -122,7 +122,7 @@
"cache_l2": 262144,
"cache_l3": 15728640,
"clock_speed": 1600000000,
"ht_capable": false,
"ht_capable": true,
"instruction_set": "x86-64",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) CPU E5-2603 v3 @ 1.60GHz",
......
......@@ -6,9 +6,13 @@
"platform_type": "x86_64"
},
"bios": {
"configuration": {
"cstate_c1e": true,
"cstate_enabled": true
},
"release_date": "04/11/2016",
"vendor": "Dell Inc.",
"version": 2.1
"version": "2.1.5"
},
"chassis": {
"manufacturer": "Dell Inc.",
......@@ -118,7 +122,7 @@
"cache_l2": 262144,
"cache_l3": 15728640,
"clock_speed": 1600000000,
"ht_capable": false,
"ht_capable": true,
"instruction_set": "x86-64",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) CPU E5-2603 v3 @ 1.60GHz",
......
......@@ -122,7 +122,7 @@
"cache_l2": 262144,
"cache_l3": 15728640,
"clock_speed": 1600000000,
"ht_capable": false,
"ht_capable": true,
"instruction_set": "x86-64",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) CPU E5-2603 v3 @ 1.60GHz",
......
......@@ -6,9 +6,13 @@
"platform_type": "x86_64"
},
"bios": {
"configuration": {
"cstate_c1e": true,
"cstate_enabled": true
},
"release_date": "04/11/2016",
"vendor": "Dell Inc.",
"version": 2.1
"version": "2.1.5"
},
"chassis": {
"manufacturer": "Dell Inc.",
......@@ -118,7 +122,7 @@
"cache_l2": 262144,
"cache_l3": 15728640,
"clock_speed": 1600000000,
"ht_capable": false,
"ht_capable": true,
"instruction_set": "x86-64",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) CPU E5-2603 v3 @ 1.60GHz",
......
......@@ -122,7 +122,7 @@
"cache_l2": 262144,
"cache_l3": 15728640,
"clock_speed": 1600000000,
"ht_capable": false,
"ht_capable": true,
"instruction_set": "x86-64",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) CPU E5-2603 v3 @ 1.60GHz",
......
......@@ -1249,6 +1249,8 @@
{
},
{
"kind": "switch",
"uid": "stalc1"
},
{
},
......
......@@ -31,8 +31,6 @@
"uid": "TALC-ADM"
},
{
"kind": "switch",
"uid": "stalc1"
},
{
},
......
......@@ -199,8 +199,8 @@
{
},
{
"kind": "switch",
"uid": "sgravillon1"
"kind": "router",
"uid": "gw-nancy"
},
{
"kind": "other",
......
......@@ -67,23 +67,6 @@ nodes:
bridged: false
vendor: intel
version: 82574L
bmc:
interface: Ethernet
rate: 100000000
enabled: true
mounted: false
mountable: false
management: true
vendor: Tyan
version: AST2050
gpu:
gpu: false
sensors:
power:
available: true
graphene-[1-72]:
network_adapters:
ib0:
enabled: true
mountable: true
......@@ -109,34 +92,20 @@ nodes:
mounted: false
rate: 10000000000
version: MT26418
graphene-[85-144]:
network_adapters:
ib0:
bmc:
interface: Ethernet
rate: 100000000
enabled: true
mountable: true
vendor: Mellanox
version: MT26418
switch: sgrapheneib
driver: mlx4_core
interface: InfiniBand
management: false
mounted: true
rate: 20000000000
version: MT26418
ib1:
enabled: false
mountable: false
vendor: Mellanox
version: MT26418
driver: mlx4_core
enabled: false
interface: InfiniBand
management: false
mountable: false
mounted: false
rate: 10000000000
version: MT26418
mountable: false
management: true
vendor: Tyan
version: AST2050
gpu:
gpu: false
sensors:
power:
available: true
graphene-96:
status: retired
......
nodes:
<% (1..144).each { |i| %>
graphene-<%= i %>:
network_adapters:
ib0:
ip: 172.18.64.<%= i %>
<% i93 = i+92 %>
kavlan:
eth0:
......
......@@ -66,6 +66,9 @@ graphene-73:
interface: InfiniBand
management: false
mountable: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fe
interface: InfiniBand
management: false
mounted: false
rate: 10000000000
version: MT26418
......
......@@ -49,23 +49,35 @@ graphene-74:
mounted: false
ib0:
driver: mlx4_core
<<<<<<< HEAD
enabled: true
=======
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd
interface: InfiniBand
ip: 172.18.64.74
ip6: fe80::202:c903:b:92dd
management: false
<<<<<<< HEAD
mountable: true
=======
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
mounted: true
rate: 20000000000
version: MT26418
ib1:
driver: mlx4_core
<<<<<<< HEAD
enabled: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
interface: InfiniBand
management: false
mountable: false
=======
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
interface: InfiniBand
management: false
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
mounted: false
rate: 10000000000
version: MT26418
......
......@@ -66,6 +66,9 @@ graphene-75:
interface: InfiniBand
management: false
mountable: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e6
interface: InfiniBand
management: false
mounted: false
rate: 10000000000
version: MT26418
......
......@@ -49,22 +49,34 @@ graphene-76:
mounted: false
ib0:
driver: mlx4_core
<<<<<<< HEAD
enabled: false
=======
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5
interface: InfiniBand
ip: 172.18.64.76
management: false
<<<<<<< HEAD
mountable: true
=======
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
mounted: true
rate: 10000000000
version: MT26418
ib1:
driver: mlx4_core
<<<<<<< HEAD
enabled: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d6
interface: InfiniBand
management: false
mountable: false
=======
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d6
interface: InfiniBand
management: false
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
mounted: false
rate: 10000000000
version: MT26418
......
......@@ -66,6 +66,9 @@ graphene-77:
interface: InfiniBand
management: false
mountable: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e2
interface: InfiniBand
management: false
mounted: false
rate: 10000000000
version: MT26418
......
......@@ -49,23 +49,35 @@ graphene-78:
mounted: false
ib0:
driver: mlx4_core
<<<<<<< HEAD
enabled: true
=======
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01
interface: InfiniBand
ip: 172.18.64.78
ip6: fe80::202:c903:b:9301
management: false
<<<<<<< HEAD
mountable: true
=======
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
mounted: true
rate: 20000000000
version: MT26418
ib1:
driver: mlx4_core
<<<<<<< HEAD
enabled: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:02
interface: InfiniBand
management: false
mountable: false
=======
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:02
interface: InfiniBand
management: false
>>>>>>> 7904da7f54971e39ad8275ad063f6778188173a0
mounted: false
rate: 10000000000
version: MT26418
......
......@@ -66,6 +66,9 @@ graphene-79:
interface: InfiniBand
management: false
mountable: false
guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6
interface: InfiniBand
management: false
mounted: false
rate: 10000000000
version: MT26418
......