From 1974b77acb8fc63e10bc996f0b6a72f4b731c9b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20Morel?= <emile.morel@inria.fr>
Date: Thu, 2 May 2013 14:44:23 +0200
Subject: [PATCH] [bordeaux] borderline - correct ib version
---
.../bordeaux/clusters/borderline/nodes/borderline-1.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-10.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-2.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-3.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-4.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-5.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-6.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-7.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-8.json | 4 ++--
.../bordeaux/clusters/borderline/nodes/borderline-9.json | 4 ++--
generators/input/sites/bordeaux/clusters/borderline.rb | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index 1148d2fcd96..304d89ababf 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index 434ab9f26fe..08cd1cb11f1 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index 7262222c775..cd6eea4849d 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index aacf8e70722..c5b1df6a4ae 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 92b3f17c065..dc40015045d 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index 9e002295478..7400b989366 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 68cf3a33582..ed81d8c0a54 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index 250ddfe4c33..a25db42bf4d 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index 550da90ae53..70ee1a3ab86 100755
--- 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",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index 5767850c356..759f24214e4 100755
--- 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",
diff --git a/generators/input/sites/bordeaux/clusters/borderline.rb b/generators/input/sites/bordeaux/clusters/borderline.rb
index 052b9ed6fc9..2551edb1ffc 100644
--- 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')
},
--
GitLab