Mentions légales du service

Skip to content
Snippets Groups Projects

[grenoble][servan] change the FPGA nic driver to n/a (xrt is not a network driver) and type to Ethernet

Merged Pierre Neyron requested to merge fpga-nic into master

driver depends on what is programmed on the FPGA.

tests wiki:gen hardware / site_hardware ok.

Edited by Pierre Neyron

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • assigned to @neyron

  • A priori coté puppet, ca ne change des trucs que dans kavlanng

    diff --git a/modules/generated/files/grid5000/kavlanng/g5k.json b/modules/generated/files/grid5000/kavlanng/g5k.json
    index c028a924..84e09ab2 100644
    --- a/modules/generated/files/grid5000/kavlanng/g5k.json
    +++ b/modules/generated/files/grid5000/kavlanng/g5k.json
    @@ -4502,9 +4502,9 @@
                     },
                     {
                       "device": "fpga0",
    -                  "driver": "xrt",
    +                  "driver": "n/a",
                       "enabled": true,
    -                  "interface": "Ethernet-FPGA",
    +                  "interface": "Ethernet",
                       "ip": "172.16.23.11",
                       "ip6": "2001:660:4406:100:8:1:0:1",
                       "kavlan": true,
    @@ -4513,6 +4513,7 @@
                       "model": "Alveo U200 QSFP28 (100GbE)",
                       "mountable": true,
                       "mounted": false,
    +                  "name": "fpga0",
                       "network_address": "servan-1-fpga0.grenoble.grid5000.fr",
                       "rate": 100000000000,
                       "sriov": false,
    @@ -4523,9 +4524,9 @@
                     },
                     {
                       "device": "fpga1",
    -                  "driver": "xrt",
    +                  "driver": "n/a",
                       "enabled": true,
    -                  "interface": "Ethernet-FPGA",
    +                  "interface": "Ethernet",
                       "ip": "172.16.23.21",
                       "ip6": "2001:660:4406:100:8:2:0:1",
                       "kavlan": true,
    @@ -4534,6 +4535,7 @@
                       "model": "Alveo U200 QSFP28 (100GbE)",
                       "mountable": true,
                       "mounted": false,
    +                  "name": "fpga1",
                       "network_address": "servan-1-fpga1.grenoble.grid5000.fr",
                       "rate": 100000000000,
                       "sriov": false,
    @@ -4634,9 +4636,9 @@
                     },
                     {
                       "device": "fpga0",
    -                  "driver": "xrt",
    +                  "driver": "n/a",
                       "enabled": true,
    -                  "interface": "Ethernet-FPGA",
    +                  "interface": "Ethernet",
                       "ip": "172.16.23.12",
                       "ip6": "2001:660:4406:100:8:1:0:2",
                       "kavlan": true,
    @@ -4645,6 +4647,7 @@
                       "model": "Alveo U200 QSFP28 (100GbE)",
                       "mountable": true,
                       "mounted": false,
    +                  "name": "fpga0",
                       "network_address": "servan-2-fpga0.grenoble.grid5000.fr",
                       "rate": 100000000000,
                       "sriov": false,
    @@ -4655,9 +4658,9 @@
                     },
                     {
                       "device": "fpga1",
    -                  "driver": "xrt",
    +                  "driver": "n/a",
                       "enabled": true,
    -                  "interface": "Ethernet-FPGA",
    +                  "interface": "Ethernet",
                       "ip": "172.16.23.22",
                       "ip6": "2001:660:4406:100:8:2:0:2",
                       "kavlan": true,
    @@ -4666,6 +4669,7 @@
                       "model": "Alveo U200 QSFP28 (100GbE)",
                       "mountable": true,
                       "mounted": false,
    +                  "name": "fpga1",
                       "network_address": "servan-2-fpga1.grenoble.grid5000.fr",
                       "rate": 100000000000,
                       "sriov": false,
  • BERARD Benjamin requested review from @beberard

    requested review from @beberard

  • Pierre Neyron changed the description

    changed the description

  • BERARD Benjamin approved this merge request

    approved this merge request

  • BERARD Benjamin added 25 commits

    added 25 commits

    • 9ce68a37...32177ca3 - 21 commits from branch master
    • 8b4384c0 - [grenoble][servan] change the FPGA nic driver to n/a (xrt is not a network driver)
    • ead234d8 - [grenoble][servan] Set NIC type of FPGA to Ethernet + set name as required by scripts
    • 1aee7b14 - [grenoble][servan] Refactor servan.yaml
    • 22fa4a84 - Regenerate API data

    Compare with previous version

  • BERARD Benjamin mentioned in commit a4d27c56

    mentioned in commit a4d27c56

Please register or sign in to reply
Loading