Commit 219eba55 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour

Merge branch 'master' into dev

Conflicts:
	generators/input/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
	generators/input/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
	generators/input/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
	generators/input/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
	generators/input/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
	generators/input/sites/nancy/clusters/graphene/graphene_manual.yaml
	generators/input/sites/sophia/net-links/gw-sophia.yaml
parents 2c88f86e cc7a5dbb
......@@ -69,7 +69,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.35.101",
"mac": "00:26:6c:f9:18:e6",
"mac": "00:26:6c:f9:18:e7",
"management": true,
"mountable": false,
"mounted": false,
......
......@@ -69,7 +69,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.35.103",
"mac": "00:26:6c:f9:15:72",
"mac": "00:26:6c:f9:15:73",
"management": true,
"mountable": false,
"mounted": false,
......
......@@ -69,7 +69,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.35.104",
"mac": "00:26:6c:f9:19:62",
"mac": "00:26:6c:f9:19:63",
"management": true,
"mountable": false,
"mounted": false,
......
......@@ -69,7 +69,7 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.17.35.107",
"mac": "00:26:6c:f9:17:b9",
"mac": "00:26:6c:f9:17:ba",
"management": true,
"mountable": false,
"mounted": false,
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -5,9 +5,9 @@
"smt_size": 12
},
"bios": {
"release_date": "05/10/2012",
"release_date": "01/22/2016",
"vendor": "Dell Inc.",
"version": "1.2.6"
"version": 2.5
},
"chassis": {
"manufacturer": "Dell Inc.",
......
......@@ -40,7 +40,7 @@
"network_address": "sol-42.sophia.grid5000.fr",
"rate": 1000000000,
"switch": "gw-sophia",
"switch_port": "GigabitEthernet4/14",
"switch_port": "GigabitEthernet4/12",
"vendor": "nVidia",
"version": "MCP55 Pro"
},
......
......@@ -40,7 +40,7 @@
"network_address": "sol-43.sophia.grid5000.fr",
"rate": 1000000000,
"switch": "gw-sophia",
"switch_port": "GigabitEthernet4/12",
"switch_port": "GigabitEthernet4/14",
"vendor": "nVidia",
"version": "MCP55 Pro"
},
......
......@@ -27,7 +27,7 @@ chirloute-1:
mountable: true
ip: 172.16.35.1
bmc:
mac: 00:26:6c:f9:18:e6
mac: 00:26:6c:f9:18:e7
ip: 172.17.35.101
operating_system:
kernel: 2.6.32-5-amd64
......@@ -41,9 +41,9 @@ chirloute-1:
rev: ES64
vendor: SEAGATE
chassis:
serial: D385Z4J
serial_number: D385Z4J
manufacturer: Dell
name: C6100
product_name: C6100
supported_job_types:
virtual: ivt
main_memory:
......
......@@ -38,12 +38,12 @@ chirloute-3:
mountable: true
ip: 172.16.35.3
bmc:
mac: 00:26:6c:f9:15:72
mac: 00:26:6c:f9:15:73
ip: 172.17.35.103
chassis:
serial: D385Z4J
serial_number: D385Z4J
manufacturer: Dell
name: C6100
product_name: C6100
supported_job_types:
virtual: ivt
main_memory:
......
......@@ -38,14 +38,14 @@ chirloute-4:
mountable: true
ip: 172.16.35.4
bmc:
mac: 00:26:6c:f9:19:62
mac: 00:26:6c:f9:19:63
ip: 172.17.35.104
supported_job_types:
virtual: ivt
chassis:
serial: D385Z4J
serial_number: D385Z4J
manufacturer: Dell
name: C6100
product_name: C6100
main_memory:
ram_size: 8580497408
processor:
......
......@@ -41,9 +41,9 @@ chirloute-7:
rev: ES64
vendor: SEAGATE
chassis:
serial: F385Z4J
serial_number: F385Z4J
manufacturer: Dell
name: C6100
product_name: C6100
supported_job_types:
virtual: ivt
processor:
......
---
taurus-1:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -73,9 +73,9 @@ taurus-1:
supported_job_types:
virtual: ivt
chassis:
serial: 8HTHD5J
serial_number: 8HTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
main_memory:
ram_size: 34359738368
processor:
......
---
taurus-10:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -71,9 +71,9 @@ taurus-10:
name: debian
version: 6.0.6
chassis:
serial: 4HTHD5J
serial_number: 4HTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
supported_job_types:
virtual: ivt
main_memory:
......
---
taurus-11:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
operating_system:
kernel: 2.6.32-5-amd64
......@@ -71,9 +71,9 @@ taurus-11:
size: 598879502336
rev: 3.13
chassis:
serial: JHTHD5J
serial_number: JHTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
supported_job_types:
virtual: ivt
processor:
......
---
taurus-13:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -73,9 +73,9 @@ taurus-13:
supported_job_types:
virtual: ivt
chassis:
serial: CHTHD5J
serial_number: CHTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
processor:
model: Intel Xeon
cache_l1d: 32768
......
---
taurus-14:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
operating_system:
kernel: 2.6.32-5-amd64
......@@ -71,9 +71,9 @@ taurus-14:
mac: d4:be:d9:f9:a3:4c
ip: 172.17.48.14
chassis:
serial: DHTHD5J
serial_number: DHTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
supported_job_types:
virtual: ivt
main_memory:
......
---
taurus-15:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
storage_devices:
sda:
......@@ -73,9 +73,9 @@ taurus-15:
supported_job_types:
virtual: ivt
chassis:
serial: 9HTHD5J
serial_number: 9HTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
main_memory:
ram_size: 34359738368
processor:
......
---
taurus-16:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
storage_devices:
sda:
......@@ -71,9 +71,9 @@ taurus-16:
name: debian
version: 6.0.6
chassis:
serial: BHTHD5J
serial_number: BHTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
supported_job_types:
virtual: ivt
main_memory:
......
---
taurus-2:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
operating_system:
kernel: 2.6.32-5-amd64
......@@ -71,9 +71,9 @@ taurus-2:
size: 598879502336
rev: 3.13
chassis:
serial: 6HTHD5J
serial_number: 6HTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
supported_job_types:
virtual: ivt
processor:
......
---
taurus-3:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -73,9 +73,9 @@ taurus-3:
supported_job_types:
virtual: ivt
chassis:
serial: 7HTHD5J
serial_number: 7HTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
processor:
model: Intel Xeon
cache_l1d: 32768
......
---
taurus-4:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -73,9 +73,9 @@ taurus-4:
supported_job_types:
virtual: ivt
chassis:
serial: FHTHD5J
serial_number: FHTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
main_memory:
ram_size: 34359738368
processor:
......
---
taurus-5:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -73,9 +73,9 @@ taurus-5:
supported_job_types:
virtual: ivt
chassis:
serial: 5HTHD5J
serial_number: 5HTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
processor:
model: Intel Xeon
cache_l1d: 32768
......
---
taurus-6:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
operating_system:
kernel: 2.6.32-5-amd64
......@@ -71,9 +71,9 @@ taurus-6:
size: 598879502336
rev: 3.13
chassis:
serial: HHTHD5J
serial_number: HHTHD5J
manufacturer: Dell Inc.
name: PowerEdge R720
product_name: PowerEdge R720
supported_job_types:
virtual: ivt
processor:
......
---
taurus-7:
bios:
version: 1.2.6
release_date: 05/10/2012
version: 2.5
release_date: 01/22/2016
vendor: Dell Inc.
network_adapters:
eth0:
......@@ -71,9 +71,9 @@ taurus-7:
size: 598879502336
rev: 3.13
chassis:
serial: 2HTHD5J
serial_number: 2HTHD5J