From a4dac87df87d496b4e1a74bf020b04f6a397f453 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Fri, 25 Oct 2019 10:18:21 +0200
Subject: [PATCH] Revert "[sagittaire] manually re-add empty by_id field"
This reverts commit 3b8f568f2ce846ef9c599735759c348026c6e764.
---
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json | 1 -
.../sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json | 1 -
22 files changed, 22 deletions(-)
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
index 1fba628e5b1..14e5a01cb97 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index 37c18264b56..5f65375e175 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index 747a15976ef..b0b8689c908 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index cfd2432482b..c0307235906 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index 32f8865df3a..85a097dff69 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 28f9723d6a0..4559571344e 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index 2092d9c1883..36114f83620 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index e36d6689752..118df402c46 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index 7fe3703aa2f..c46d8037fcb 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
index b14bf342b99..f944932bed2 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index 09312c285d4..057b66d677e 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index 6623236aa1c..af0af3cae45 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
index 53bbf52bd39..a51a1fe53db 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
index 669fb702db8..bdbdd12a622 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
index 1ec2076dd97..3aa8c7e9f27 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index a1cac9798d2..1f2c5dfde18 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
index 489c0c6a5c0..6ceaa72bd84 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
index 13626804c57..45eb975fa1f 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index 4b9e45dce9b..fbad7ec9588 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index 84a9d402ead..f79de154f40 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index e0e7ee75133..a8a2b7c0609 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
index a0bf23c400d..41705ab54e5 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
@@ -146,7 +146,6 @@
},
"storage_devices": [
{
- "by_id": "",
"by_path": "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0",
"device": "sda",
"driver": "mptspi",
--
GitLab