[lyon] hercule - change device sdb/sdc to sda (g5kcheck bug)

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",

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",

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",

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",

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'),

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: