Skip to content

Commit c5ae40d

Browse files
committed
Revert back to 9bff28e
1 parent a60a721 commit c5ae40d

File tree

3 files changed

+1
-90
lines changed

3 files changed

+1
-90
lines changed

lib/facter/infiniband_topology.rb

Lines changed: 0 additions & 76 deletions
This file was deleted.

manifests/config/topology.pp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,8 @@
1515

1616
class slurm::config::topology (
1717
Array[Hash[String, String]] $switches,
18-
Optional[String] $autodiscover = undef,
1918
) {
2019

21-
# Either the topology is autodiscovered through a fact,
22-
# (we currently only support infiniband autodiscovery)
23-
# or we use the topology supplied by hiera
24-
case $autodiscover {
25-
'infiniband': {
26-
$network_topology = $facts['infiniband_topology']
27-
}
28-
default: {
29-
$network_topology = $switches
30-
}
31-
}
32-
3320
# Topology file
3421
file{'/etc/slurm/topology.conf':
3522
ensure => file,

templates/topology.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
# Parameters for the topology plugin
1616
#
1717

18-
<% @network_topology.each do |switch| -%>
18+
<% @switches.each do |switch| -%>
1919
<%= switch.map{|pair| pair.join('=')}.join(' ') %>
2020
<% end %>

0 commit comments

Comments
 (0)