Skip to content

Commit 1b7702c

Browse files
committed
Merge branch 'nova_disk' into 'master'
Activation of SR-IOV caused a change on the disks See merge request grid5000/reference-repository!209
2 parents 4712efd + 980dddf commit 1b7702c

32 files changed

+160
-160
lines changed

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a8d",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a68a5",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973be828e7",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973b80345a",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a75",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ad9",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973be828eb",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973be828e9",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ab5",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a99",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973bf03b57",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973bf03b54",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a68ad",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ac9",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973be828f2",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973be828e6",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ac1",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a81",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973be828ea",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973be828ee",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a79",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ac5",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973bf03b56",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973bf03b58",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a6891",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a85",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973be828f0",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973be828f1",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"storage_devices": [
264264
{
265265
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a7d",
266-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
266+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
267267
"device": "sda",
268268
"firmware_version": "AM07",
269269
"interface": "SAS",
@@ -274,7 +274,7 @@
274274
},
275275
{
276276
"by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a91",
277-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
277+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
278278
"device": "sdb",
279279
"firmware_version": "AM07",
280280
"interface": "SAS",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"by_id": "/dev/disk/by-id/wwn-0x500003973be828f3",
289-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
289+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
290290
"device": "sdc",
291291
"firmware_version": "FJ3D",
292292
"interface": "SATA",
@@ -298,7 +298,7 @@
298298
},
299299
{
300300
"by_id": "/dev/disk/by-id/wwn-0x500003973be828e8",
301-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
301+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
302302
"device": "sdd",
303303
"firmware_version": "FJ3D",
304304
"interface": "SATA",

data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
"storage_devices": [
392392
{
393393
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e514393",
394-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
394+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
395395
"device": "sda",
396396
"firmware_version": "TT31",
397397
"interface": "SAS",
@@ -402,7 +402,7 @@
402402
},
403403
{
404404
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7",
405-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
405+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
406406
"device": "sdb",
407407
"firmware_version": "TT31",
408408
"interface": "SAS",
@@ -414,7 +414,7 @@
414414
},
415415
{
416416
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3",
417-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
417+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
418418
"device": "sdc",
419419
"firmware_version": "TT31",
420420
"interface": "SAS",
@@ -426,7 +426,7 @@
426426
},
427427
{
428428
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f88af",
429-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
429+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
430430
"device": "sdd",
431431
"firmware_version": "TT31",
432432
"interface": "SAS",
@@ -438,7 +438,7 @@
438438
},
439439
{
440440
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e50d4df",
441-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
441+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
442442
"device": "sde",
443443
"firmware_version": "TT31",
444444
"interface": "SAS",
@@ -450,7 +450,7 @@
450450
},
451451
{
452452
"by_id": "/dev/disk/by-id/wwn-0x500003967c8aa2d4",
453-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
453+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
454454
"device": "sdf",
455455
"firmware_version": "A4B3",
456456
"interface": "SAS",

data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
"storage_devices": [
392392
{
393393
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e501987",
394-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
394+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
395395
"device": "sda",
396396
"firmware_version": "TT31",
397397
"interface": "SAS",
@@ -402,7 +402,7 @@
402402
},
403403
{
404404
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4fd00f",
405-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
405+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
406406
"device": "sdb",
407407
"firmware_version": "TT31",
408408
"interface": "SAS",
@@ -414,7 +414,7 @@
414414
},
415415
{
416416
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f92df",
417-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
417+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
418418
"device": "sdc",
419419
"firmware_version": "TT31",
420420
"interface": "SAS",
@@ -426,7 +426,7 @@
426426
},
427427
{
428428
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f948f",
429-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
429+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
430430
"device": "sdd",
431431
"firmware_version": "TT31",
432432
"interface": "SAS",
@@ -438,7 +438,7 @@
438438
},
439439
{
440440
"by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9127",
441-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
441+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
442442
"device": "sde",
443443
"firmware_version": "TT31",
444444
"interface": "SAS",
@@ -450,7 +450,7 @@
450450
},
451451
{
452452
"by_id": "/dev/disk/by-id/wwn-0x500003967c8aa2d0",
453-
"by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
453+
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
454454
"device": "sdf",
455455
"firmware_version": "A4B3",
456456
"interface": "SAS",

0 commit comments

Comments
 (0)