Skip to content

Commit 43a2d72

Browse files
author
Lucas Nussbaum
committed
[dev/wiki] add queue name in link (storage table)
1 parent a04adc1 commit 43a2d72

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

generators/wiki/lib/generators/hardware.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ def generate_storage
270270
else
271271
ssd_t = ssds.count.to_s + " (" + ssds.map { |d| storage_size_to_text(d[1]['size']) }.join(', ') + ")"
272272
end
273-
nodes_data << { 'uid' => node_uid, 'data' => { 'main' => maindisk_t, 'hdd' => hdd_t, 'ssd' => ssd_t, 'reservation' => reservable_disks } }
273+
queues = cluster_hash['queues'] - ['admin', 'default']
274+
queue_t = (queues.nil? || (queues.empty? ? '' : "_.28" + queues[0].gsub(' ', '_') + ' queue.29'))
275+
nodes_data << { 'uid' => node_uid, 'data' => { 'main' => maindisk_t, 'hdd' => hdd_t, 'ssd' => ssd_t, 'reservation' => reservable_disks, 'queue' => queue_t } }
274276
end
275277
nd = nodes_data.group_by { |d| d['data'] }
276278
nd.each do |data, nodes|
@@ -283,7 +285,7 @@ def generate_storage
283285
end
284286
table_data << [
285287
"[[#{site_uid.capitalize}:Hardware|#{site_uid.capitalize}]]",
286-
"[[#{site_uid.capitalize}:Hardware##{cluster_uid}|#{nodesetname}]]",
288+
"[[#{site_uid.capitalize}:Hardware##{cluster_uid}#{data['queue']}|#{nodesetname}]]",
287289
nodes.length,
288290
data['main'],
289291
data['hdd'],

0 commit comments

Comments
 (0)