Skip to content
GitLab
Commit d8aa5adf authored by Emile Morel's avatar Emile Morel
Browse files

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

parent fc251188
Hide whitespace changes
Inline Side-by-side
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json
View file @ d8aa5adf
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdb", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdc", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
......
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json
View file @ d8aa5adf
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdb", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdc", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
......
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json
View file @ d8aa5adf
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdb", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdc", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
......
data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json
View file @ d8aa5adf
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdb", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
"size": 2000398934016 "size": 2000398934016
}, },
{ {
"device": "sdc", "device": "sda",
"driver": "ahci", "driver": "ahci",
"interface": "SATA", "interface": "SATA",
"model": "WDC WD2003FYYS-1", "model": "WDC WD2003FYYS-1",
......
generators/input/sites/lyon/clusters/hercule.rb
View file @ d8aa5adf
...@@ -53,16 +53,16 @@ site :lyon do |site_uid| ...@@ -53,16 +53,16 @@ site :lyon do |site_uid|
storage_devices [{ storage_devices [{
:interface => 'SATA', :interface => 'SATA',
:size => lookup('hercule_generated', node_uid, 'block_devices' ,'sda', 'size'),
:driver => "ahci", :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'), :model => lookup('hercule_generated', node_uid, 'block_devices' ,'sda', 'model'),
:rev => lookup('hercule_generated', node_uid, 'block_devices', 'sda', 'rev'), :rev => lookup('hercule_generated', node_uid, 'block_devices', 'sda', 'rev'),
}, },
{ {
:interface => 'SATA', :interface => 'SATA',
:driver => "ahci", :driver => "ahci",
:device => "sdb", :device => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'device'),
:size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'size'), :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'size'),
:model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'model'), :model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdb', 'model'),
:rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdb', 'rev'), :rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdb', 'rev'),
...@@ -70,7 +70,7 @@ site :lyon do |site_uid| ...@@ -70,7 +70,7 @@ site :lyon do |site_uid|
{ {
:interface => 'SATA', :interface => 'SATA',
:driver => "ahci", :driver => "ahci",
:device => "sdc", :device => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'device'),
:size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'size'), :size => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'size'),
:model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'model'), :model => lookup('hercule_generated', node_uid, 'block_devices' ,'sdc', 'model'),
:rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdc', 'rev'), :rev => lookup('hercule_generated', node_uid, 'block_devices', 'sdc', 'rev'),
......
generators/input/sites/lyon/clusters/hercule_generated.yaml
View file @ d8aa5adf
...@@ -51,12 +51,12 @@ hercule-1: ...@@ -51,12 +51,12 @@ hercule-1:
rev: 1.0 rev: 1.0
sdb: sdb:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdb device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
sdc: sdc:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdc device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
operating_system: operating_system:
...@@ -142,12 +142,12 @@ hercule-2: ...@@ -142,12 +142,12 @@ hercule-2:
rev: 1.0 rev: 1.0
sdb: sdb:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdb device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
sdc: sdc:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdc device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
supported_job_types: supported_job_types:
...@@ -186,12 +186,12 @@ hercule-3: ...@@ -186,12 +186,12 @@ hercule-3:
rev: 1.0 rev: 1.0
sdb: sdb:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdb device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
sdc: sdc:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdc device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
network_interfaces: network_interfaces:
...@@ -277,12 +277,12 @@ hercule-4: ...@@ -277,12 +277,12 @@ hercule-4:
rev: 1.0 rev: 1.0
sdb: sdb:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdb device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
sdc: sdc:
model: WDC WD2003FYYS-1 model: WDC WD2003FYYS-1
device: sdc device: sda
size: 2000398934016 size: 2000398934016
rev: 1.0 rev: 1.0
network_interfaces: network_interfaces:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment