From 06a0bf34c0c2eb0829f5d1ed743a3e1222d39111 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Tue, 29 Jun 2021 14:40:01 +0200
Subject: [PATCH] [gen/wiki] show disk id for each disk and make disk0 the
primary
Previously, the main disk was sda which is not true for neowise.
---
lib/refrepo/gen/wiki/generators/site_hardware.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb
index 9719ce6333a..ae1c43d6d4a 100644
--- a/lib/refrepo/gen/wiki/generators/site_hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb
@@ -307,6 +307,7 @@ def get_hardware(sites)
'device' => v['device'],
'size' => v['size'],
'tech' => v['storage'],
+ 'id' => v['id'],
'interface' => v['interface'],
'vendor' => v['vendor'],
'model' => v['alt_model_name'] || v['model'],
@@ -321,6 +322,7 @@ def get_hardware(sites)
has_reservable_disks ||= e['reservation']
[
e['count'] > 1 ? "\n*" : '',
+ e['id'] + ',',
G5K.get_size(e['size'],'metric'),
e['tech'],
e['interface'],
@@ -328,7 +330,7 @@ def get_hardware(sites)
e['model'],
'(dev: /dev/' + e['device'] + (e['reservation'] ? '*' : '') + ', by-path: ' + (e['path'] || 'MISSING') + ')',
e['reservation'] ? '[[Disk_reservation|(reservable)]]' : '',
- e['device'] == 'sda' ? '(primary disk)' : ''
+ e['id'] == 'disk0' ? '(primary disk)' : ''
].join(' ')
}.join('<br />')
--
GitLab