diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
index 2825c263f1311bd50061c890f905c361b461d7a9..71e39b21420b98f9f319ad44aa1d8664e6a4102e 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
@@ -142,7 +142,7 @@
"size": 2000398934016
},
{
- "device": "sdb",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
@@ -150,7 +150,7 @@
"size": 2000398934016
},
{
- "device": "sdc",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
index eaf440a232c98f5d4dc1324859c6be45a9c48b54..e26217eb5bd88f6a998b81bef5c5f86f5886c1cd 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
@@ -142,7 +142,7 @@
"size": 2000398934016
},
{
- "device": "sdb",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
@@ -150,7 +150,7 @@
"size": 2000398934016
},
{
- "device": "sdc",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
index 100e613441c88670de0b2854f19c79dd55a3ae89..0b4ef86967e76a8169cbd03cec177083521e2307 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
@@ -142,7 +142,7 @@
"size": 2000398934016
},
{
- "device": "sdb",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
@@ -150,7 +150,7 @@
"size": 2000398934016
},
{
- "device": "sdc",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
index 382f78955e65d1eb1f4b4091820173a051f9290c..32cb65921f1501ec5dfcdd2de094557fb0eda2db 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
@@ -142,7 +142,7 @@
"size": 2000398934016
},
{
- "device": "sdb",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
@@ -150,7 +150,7 @@
"size": 2000398934016
},
{
- "device": "sdc",
+ "device": "sda",
"driver": "ahci",
"interface": "SATA",
"model": "WDC WD2003FYYS-1",
diff --git a/generators/input/sites/lyon/clusters/hercule.rb b/generators/input/sites/lyon/clusters/hercule.rb
index 8737952eacffb44a234283151e41c325255193a1..76fbf172ff93bbc87e2b8c81e58fd3290be3e01b 100644
--- a/generators/input/sites/lyon/clusters/hercule.rb
+++ b/generators/input/sites/lyon/clusters/hercule.rb
@@ -53,16 +53,16 @@ site :lyon do |site_uid|
storage_devices [{
:interface => 'SATA',
- :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sda', 'size'),
:driver => "ahci",
- :device => "sda",
+ :device => lookup('hercule_generated', node_uid, 'block_devices' ,'sda', 'device'),
+ :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sda', 'size'),
:model => lookup('hercule_generated', node_uid, 'block_devices' ,'sda', 'model'),
:rev => lookup('hercule_generated', node_uid, 'block_devices', 'sda', 'rev'),
},
{
:interface => 'SATA',
:driver => "ahci",
- :device => "sdb",
+ :device => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'device'),
:size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'size'),
:model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'model'),
:rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdb', 'rev'),
@@ -70,7 +70,7 @@ site :lyon do |site_uid|
{
:interface => 'SATA',
:driver => "ahci",
- :device => "sdc",
+ :device => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'device'),
:size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'size'),
:model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'model'),
:rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdc', 'rev'),
diff --git a/generators/input/sites/lyon/clusters/hercule_generated.yaml b/generators/input/sites/lyon/clusters/hercule_generated.yaml
index 814a0080cd7a6e908defb5f5010077358794dedb..9bc0651f494bb93c724098e79eb059a3e1b597d5 100644
--- a/generators/input/sites/lyon/clusters/hercule_generated.yaml
+++ b/generators/input/sites/lyon/clusters/hercule_generated.yaml
@@ -51,12 +51,12 @@ hercule-1:
rev: 1.0
sdb:
model: WDC WD2003FYYS-1
- device: sdb
+ device: sda
size: 2000398934016
rev: 1.0
sdc:
model: WDC WD2003FYYS-1
- device: sdc
+ device: sda
size: 2000398934016
rev: 1.0
operating_system:
@@ -142,12 +142,12 @@ hercule-2:
rev: 1.0
sdb:
model: WDC WD2003FYYS-1
- device: sdb
+ device: sda
size: 2000398934016
rev: 1.0
sdc:
model: WDC WD2003FYYS-1
- device: sdc
+ device: sda
size: 2000398934016
rev: 1.0
supported_job_types:
@@ -186,12 +186,12 @@ hercule-3:
rev: 1.0
sdb:
model: WDC WD2003FYYS-1
- device: sdb
+ device: sda
size: 2000398934016
rev: 1.0
sdc:
model: WDC WD2003FYYS-1
- device: sdc
+ device: sda
size: 2000398934016
rev: 1.0
network_interfaces:
@@ -277,12 +277,12 @@ hercule-4:
rev: 1.0
sdb:
model: WDC WD2003FYYS-1
- device: sdb
+ device: sda
size: 2000398934016
rev: 1.0
sdc:
model: WDC WD2003FYYS-1
- device: sdc
+ device: sda
size: 2000398934016
rev: 1.0
network_interfaces: