From 8bf36f26fe81e4ad94aaa149684bc14abc00acec Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Tue, 3 May 2022 23:44:08 +0200
Subject: [PATCH] [servan/fpga] add rate to fix mkmotd on grenoble and fix dhcp
bind filed
---
.../grid5000/sites/grenoble/clusters/servan/nodes/servan-1.json | 2 ++
.../grid5000/sites/grenoble/clusters/servan/nodes/servan-2.json | 2 ++
input/grid5000/sites/grenoble/clusters/servan/servan.yaml | 2 ++
lib/refrepo/gen/puppet/dhcpg5k.rb | 2 +-
4 files changed, 7 insertions(+), 1 deletion(-)
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 967e39fd4b6..9dc451a374f 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 8731b99a918..509b63edaa1 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 586db012692..cba2c1824e8 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 d9222215dd8..066f65d5511 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}"
--
GitLab