diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json index 967e39fd4b6c381b4699a44533cbf1af695848c8..9dc451a374f3519febd9defcd42fdbe9b5361a26 100644 --- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json +++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json @@ -286,6 +286,7 @@ "mountable": true, "mounted": false, "network_address": "servan-1-fpga0.grenoble.grid5000.fr", + "rate": 25000000000, "switch": "gw", "switch_port": "ethernet1/1/97" }, @@ -301,6 +302,7 @@ "mountable": true, "mounted": false, "network_address": "servan-1-fpga1.grenoble.grid5000.fr", + "rate": 25000000000, "switch": "gw", "switch_port": "ethernet1/1/98" } diff --git a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json index 8731b99a918cc47d94d416b251e36f32e21601e6..509b63edaa140e207547fe06063b1017b6d85d47 100644 --- a/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json +++ b/data/grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json @@ -286,6 +286,7 @@ "mountable": true, "mounted": false, "network_address": "servan-2-fpga0.grenoble.grid5000.fr", + "rate": 25000000000, "switch": "gw", "switch_port": "ethernet1/1/99" }, @@ -301,6 +302,7 @@ "mountable": true, "mounted": false, "network_address": "servan-2-fpga1.grenoble.grid5000.fr", + "rate": 25000000000, "switch": "gw", "switch_port": "ethernet1/1/100" } diff --git a/input/grid5000/sites/grenoble/clusters/servan/servan.yaml b/input/grid5000/sites/grenoble/clusters/servan/servan.yaml index 586db012692e9a645ac32651c8316e18839907dd..cba2c1824e8530a0790be9096024d9bdfb5f54b7 100644 --- a/input/grid5000/sites/grenoble/clusters/servan/servan.yaml +++ b/input/grid5000/sites/grenoble/clusters/servan/servan.yaml @@ -46,6 +46,7 @@ nodes: mountable: true mounted: false kavlan: true + rate: 25000000000 fpga1: interface: Ethernet management: false @@ -53,6 +54,7 @@ nodes: mountable: true mounted: false kavlan: true + rate: 25000000000 storage_devices: pci-0000:c3:00.0-nvme-1: interface: NVME diff --git a/lib/refrepo/gen/puppet/dhcpg5k.rb b/lib/refrepo/gen/puppet/dhcpg5k.rb index d9222215dd83cb888edee164073482f3ac882f28..066f65d55114728ec33e5ba2462badf805d29e1c 100644 --- a/lib/refrepo/gen/puppet/dhcpg5k.rb +++ b/lib/refrepo/gen/puppet/dhcpg5k.rb @@ -4,7 +4,7 @@ def get_network_info(node_hash, network_interface) network_infos = [] if network_interface == "eth" then - adapters = node_network_adapters.select { |i| i['device'] =~ /(eth|fpga)/ and (i['mountable'] or i['mounted'])} + adapters = node_network_adapters.select { |i| i['device'] =~ /eth/ and (i['mountable'] or i['mounted'])} if adapters.length > 0 if not adapters[0]['mounted'] raise "#{node_hash['uid']}: inconsistency: this code assumes first mountable ethernet adapter should be mounted: #{node_network_adapters}"