[bordeaux] borderline - correct ib version

1974b77a · Émile Morel · ba48c8fe · 1974b77a · 1974b77a · 1974b77a
Commit 1974b77a authored May 02, 2013 by Émile Morel
11 changed files
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-1-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-10-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-2-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-3-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-4-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-5-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-6-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-7-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-8-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -73,7 +73,7 @@
      "network_address": "borderline-9-ib0.bordeaux.grid5000.fr",
      "rate": 20000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "ib1",
@@ -86,7 +86,7 @@
      "mounted": false,
      "rate": 10000000000,
      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
+      "version": "MT25418"
    },
    {
      "device": "myri0",

--- a/generators/input/sites/bordeaux/clusters/borderline.rb
+++ b/generators/input/sites/bordeaux/clusters/borderline.rb
@@ -105,7 +105,7 @@ site :bordeaux do |site_uid|
          :mountable        => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'mountable'),
          :mounted          => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'mounted'),
          :vendor           => 'Mellanox',
-          :version 	    => "InfiniHost MT25208",
+          :version 	    => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'version'),
          :driver           => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'driver'),
          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
          :ip               => lookup('borderline', node_uid, 'network_interfaces', 'ib0', 'ip'),
@@ -120,7 +120,7 @@ site :bordeaux do |site_uid|
          :mountable        => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'mountable'),
          :mounted          => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'mounted'),
          :vendor           => 'Mellanox',
-          :version 	    => "InfiniHost MT25208",
+          :version 	    => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'version'),
          :driver           => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'driver'),
          :guid             => lookup('borderline', node_uid, 'network_interfaces', 'ib1', 'guid')
        },