Skip to content
GitLab
Commit da7d230e authored by PARISOT Clement's avatar PARISOT Clement
Browse files

[nancy] grimoire - Change SSD position (see bug #6562)

parent 00bd9130
Hide whitespace changes
Inline Side-by-side
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
View file @ da7d230e
......@@ -203,9 +203,9 @@
"device": "sda",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
},
......@@ -253,11 +253,11 @@
"device": "sdf",
"driver": "megaraid_sas",
"interface": "SCSI",
"model": "ST600MM0088",
"rev": "TT31",
"size": 600127266816,
"storage": "HDD",
"vendor": "LSI Logic / Symbios Logic"
"model": "PX02SSF020",
"rev": "A4AF",
"size": 200049647616,
"storage": "SSD",
"vendor": "TOSHIBA"
}
],
"supported_job_types": {
......
generators/input/sites/nancy/clusters/grimoire/grimoire.rb
View file @ da7d230e
......@@ -109,9 +109,9 @@ site :nancy do |site_uid|
:driver => "megaraid_sas",
:device => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'device'),
:model => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'model'),
:vendor => 'LSI Logic / Symbios Logic',
:vendor => 'TOSHIBA',
:rev => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'rev'),
:storage => 'HDD'
:storage => 'SSD'
}]
network_adapters [{
......
generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
View file @ da7d230e
......@@ -15,11 +15,11 @@ grimoire-1:
block_devices:
sda:
device: sda
size: 200049647616
model: PX02SSF020
rev: A4AF
timeread: 266
timewrite: 1242
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1277
timewrite: 2800
sdb:
device: sdb
size: 600127266816
......@@ -42,20 +42,14 @@ grimoire-1:
rev: TT31
sdf:
device: sdf
size: 600127266816
model: ST600MM0088
rev: TT31
size: 200049647616
model: PX02SSF020
rev: A4AF
supported_job_types:
virtual: ivt
main_memory:
ram_size: 135291469824
network_interfaces:
eth4:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:0c:cc
mounted: false
management: false
eth0:
interface: Ethernet
ip: 172.16.71.1
......@@ -70,16 +64,22 @@ grimoire-1:
mac: 24:6e:96:03:0c:ca
mounted: false
management: false
eth5:
eth2:
interface: Ethernet
driver: ixgbe
mac: a0:36:9f:7f:35:b8
mounted: false
management: false
eth4:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:0c:cd
mac: 24:6e:96:03:0c:cc
mounted: false
management: false
eth2:
eth5:
interface: Ethernet
driver: ixgbe
mac: a0:36:9f:7f:35:b8
driver: igb
mac: 24:6e:96:03:0c:cd
mounted: false
management: false
eth3:
......
generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
View file @ da7d230e
......@@ -15,11 +15,11 @@ grimoire-2:
block_devices:
sda:
device: sda
size: 200049647616
model: PX02SSF020
rev: A4AF
timeread: 267
timewrite: 1226
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1289
timewrite: 2889
sdb:
device: sdb
size: 600127266816
......@@ -42,9 +42,9 @@ grimoire-2:
rev: TT31
sdf:
device: sdf
size: 600127266816
model: ST600MM0088
rev: TT31
size: 200049647616
model: PX02SSF020
rev: A4AF
supported_job_types:
virtual: ivt
main_memory:
......@@ -64,18 +64,18 @@ grimoire-2:
rate: 10000000000
mounted: true
management: false
eth1:
interface: Ethernet
driver: ixgbe
mac: 24:6e:96:03:24:7a
mounted: false
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:24:7d
mounted: false
management: false
eth1:
interface: Ethernet
driver: ixgbe
mac: 24:6e:96:03:24:7a
mounted: false
management: false
eth2:
interface: Ethernet
driver: ixgbe
......
generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
View file @ da7d230e
......@@ -15,11 +15,11 @@ grimoire-3:
block_devices:
sda:
device: sda
size: 200049647616
model: PX02SSF020
rev: A4AF
timeread: 268
timewrite: 1238
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1256
timewrite: 2713
sdb:
device: sdb
size: 600127266816
......@@ -42,9 +42,9 @@ grimoire-3:
rev: TT31
sdf:
device: sdf
size: 600127266816
model: ST600MM0088
rev: TT31
size: 200049647616
model: PX02SSF020
rev: A4AF
supported_job_types:
virtual: ivt
main_memory:
......@@ -56,12 +56,6 @@ grimoire-3:
mac: 24:6e:96:03:20:f4
mounted: false
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:20:f5
mounted: false
management: false
eth0:
interface: Ethernet
ip: 172.16.71.3
......@@ -70,6 +64,12 @@ grimoire-3:
rate: 10000000000
mounted: true
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:03:20:f5
mounted: false
management: false
eth1:
interface: Ethernet
driver: ixgbe
......
generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
View file @ da7d230e
......@@ -15,11 +15,11 @@ grimoire-4:
block_devices:
sda:
device: sda
size: 200049647616
model: PX02SSF020
rev: A4AF
timeread: 268
timewrite: 1231
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1305
timewrite: 2951
sdb:
device: sdb
size: 600127266816
......@@ -42,9 +42,9 @@ grimoire-4:
rev: TT31
sdf:
device: sdf
size: 600127266816
model: ST600MM0088
rev: TT31
size: 200049647616
model: PX02SSF020
rev: A4AF
supported_job_types:
virtual: ivt
main_memory:
......
generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
View file @ da7d230e
......@@ -15,11 +15,11 @@ grimoire-5:
block_devices:
sda:
device: sda
size: 200049647616
model: PX02SSF020
rev: A4AF
timeread: 267
timewrite: 1228
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1266
timewrite: 2907
sdb:
device: sdb
size: 600127266816
......@@ -42,9 +42,9 @@ grimoire-5:
rev: TT31
sdf:
device: sdf
size: 600127266816
model: ST600MM0088
rev: TT31
size: 200049647616
model: PX02SSF020
rev: A4AF
supported_job_types:
virtual: ivt
main_memory:
......@@ -64,12 +64,6 @@ grimoire-5:
rate: 10000000000
mounted: true
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:02:96:95
mounted: false
management: false
eth1:
interface: Ethernet
driver: ixgbe
......@@ -82,6 +76,12 @@ grimoire-5:
mac: a0:36:9f:7e:4c:ac
mounted: false
management: false
eth5:
interface: Ethernet
driver: igb
mac: 24:6e:96:02:96:95
mounted: false
management: false
eth3:
interface: Ethernet
driver: ixgbe
......
generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
View file @ da7d230e
......@@ -15,11 +15,11 @@ grimoire-6:
block_devices:
sda:
device: sda
size: 200049647616
model: PX02SSF020
rev: A4AF
timeread: 265
timewrite: 1226
size: 600127266816
model: ST600MM0088
rev: TT31
timeread: 1310
timewrite: 2993
sdb:
device: sdb
size: 600127266816
......@@ -42,20 +42,14 @@ grimoire-6:
rev: TT31
sdf:
device: sdf
size: 600127266816
model: ST600MM0088
rev: TT31
size: 200049647616
model: PX02SSF020
rev: A4AF
supported_job_types:
virtual: ivt
main_memory:
ram_size: 135291469824
network_interfaces:
eth4:
interface: Ethernet
driver: igb
mac: 24:6e:96:02:a3:8c
mounted: false
management: false
eth0:
interface: Ethernet
ip: 172.16.71.6
......@@ -64,16 +58,22 @@ grimoire-6:
rate: 10000000000
mounted: true
management: false
eth5:
eth1:
interface: Ethernet
driver: ixgbe
mac: 24:6e:96:02:a3:8a
mounted: false
management: false
eth4:
interface: Ethernet
driver: igb
mac: 24:6e:96:02:a3:8d
mac: 24:6e:96:02:a3:8c
mounted: false
management: false
eth1:
eth5:
interface: Ethernet
driver: ixgbe
mac: 24:6e:96:02:a3:8a
driver: igb
mac: 24:6e:96:02:a3:8d