From 1ceba63d85e98d86987455430a8a60a910bad9b7 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Wed, 10 Aug 2011 10:18:15 +0200
Subject: [PATCH] [orsay] updating switch configurations for gdx-[289-297].
---
.../orsay/clusters/gdx/nodes/gdx-289.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-290.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-291.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-292.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-293.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-294.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-295.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-296.json | 39 +++++++++++++++++++
.../orsay/clusters/gdx/nodes/gdx-297.json | 39 +++++++++++++++++++
generators/grid5000 | 2 +-
generators/input/orsay-links.yaml | 6 +--
11 files changed, 355 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index ab7738bc6a..2014c5e10a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.1",
+ "mac": "00:11:25:91:48:22",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-289-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.1",
+ "mac": "00:11:25:C4:33:68",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-289.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index b4995709fe..16d1104996 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -10,6 +10,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.2",
+ "mac": "00:11:25:91:48:A4",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-290-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -28,6 +49,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.2",
+ "mac": "00:11:25:C4:33:7C",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-290.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 6c09cc4afd..56ee7f09d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.3",
+ "mac": "00:11:25:91:47:77",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-291-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.3",
+ "mac": "00:11:25:C4:33:1C",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-291.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 759f77568e..765f82116f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.4",
+ "mac": "00:11:25:91:46:19",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-292-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.4",
+ "mac": "00:11:25:C4:33:88",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-292.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 0926af166b..f3359575e4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.5",
+ "mac": "00:11:25:91:43:D8",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-293-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.5",
+ "mac": "00:11:25:C4:33:4A",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-293.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index 70fd4ed7a6..abf9e1965c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.6",
+ "mac": "00:11:25:91:47:EF",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-294-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.6",
+ "mac": "00:11:25:C4:33:24",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-294.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index 08ea1f9a83..25585226f4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.7",
+ "mac": "00:11:25:91:46:5A",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-295-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.7",
+ "mac": "00:11:25:C4:33:7A",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-295.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 36863cae2f..8146282dc9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.8",
+ "mac": "00:11:25:91:47:AB",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-296-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.8",
+ "mac": "00:11:25:C4:20:06",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-296.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index 81920f1a51..9194dd4ecc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -9,6 +9,27 @@
"virtual_size": null
},
"network_adapters": [
+ {
+ "device": "bmc",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.26.152.9",
+ "mac": "00:11:25:91:47:D2",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "gdx-297-bmc.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_console": "mrv09.orsay.grid5000.fr",
+ "switch_console_ip": "172.26.120.209",
+ "switch_console_mac": "00:A0:9C:00:25:4A",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "myri0",
"driver": "mx_driver",
@@ -27,6 +48,24 @@
"vendor": "Myrinet",
"version": "10G-PCIE-8A-C"
},
+ {
+ "device": "eth0",
+ "driver": "tg3",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.24.25.9",
+ "mac": "00:11:25:C4:33:3C",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "network_address": "gdx-297.orsay.grid5000.fr",
+ "rate": 1000000000,
+ "switch": "procurve17.orsay.grid5000.fr",
+ "switch_ip": "172.26.120.117",
+ "switch_mac": "00:17:A4:80:81:80",
+ "vendor": "Broadcom",
+ "version": "NetXtreme BCM5780"
+ },
{
"device": "eth1",
"driver": "tg3",
diff --git a/generators/grid5000 b/generators/grid5000
index 6bb1880d1f..407156f947 100755
--- a/generators/grid5000
+++ b/generators/grid5000
@@ -14,7 +14,7 @@ rescue LoadError => e
exit!
rescue Bundler::GemNotFound => e
STDERR.puts e.message
- STDERR.puts "Try running `bundle install`."
+ STDERR.puts "Try running `sudo bundle install`."
exit!
end
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
index ac1777ff96..84a7d736b1 100644
--- a/generators/input/orsay-links.yaml
+++ b/generators/input/orsay-links.yaml
@@ -134,10 +134,10 @@ switch-to-switch:
- procurve17:
width: 2
nodes:
- - "gdx-298,310-eth0"
- - "gdx-298,310-bmc"
+ - "gdx-289,310-eth0"
+ - "gdx-289,310-bmc"
next:
- mrv09:
width: 1
- nodes: "gdx-298,310-rsa"
+ nodes: "gdx-289,310-rsa"
\ No newline at end of file
--
GitLab