From d8aa5adfdf4f9ee3633d0c97784f18bffe9a9a7b Mon Sep 17 00:00:00 2001 From: Emile Morel <emile.morel@inria.fr> Date: Tue, 24 Sep 2013 15:34:08 +0200 Subject: [PATCH] [lyon] hercule - change device sdb/sdc to sda (g5kcheck bug) --- .../lyon/clusters/hercule/nodes/hercule-1.json | 4 ++-- .../lyon/clusters/hercule/nodes/hercule-2.json | 4 ++-- .../lyon/clusters/hercule/nodes/hercule-3.json | 4 ++-- .../lyon/clusters/hercule/nodes/hercule-4.json | 4 ++-- generators/input/sites/lyon/clusters/hercule.rb | 8 ++++---- .../sites/lyon/clusters/hercule_generated.yaml | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) 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 2825c263f13..71e39b21420 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 eaf440a232c..e26217eb5bd 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 100e613441c..0b4ef86967e 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 382f78955e6..32cb65921f1 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 8737952eacf..76fbf172ff9 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 814a0080cd7..9bc0651f494 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: -- GitLab