Commit ee09542b authored by Guillaume Ranquet's avatar Guillaume Ranquet Committed by g5kadmin user

[grenoble] fix adonis-[11,12] interfaces

parent 04702489
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-1-eth0.grenoble.grid5000.fr", "network_address": "adonis-1-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-10-eth0.grenoble.grid5000.fr", "network_address": "adonis-10-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
}, },
"network_adapters": [ "network_adapters": [
{ {
"device": "ib0",
"enabled": true, "enabled": true,
"interface": "InfiniBand", "interface": "InfiniBand",
"ip": "172.16.18.141", "ip": "172.16.18.141",
"management": false, "management": false,
"mountable": false, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-11.grenoble.grid5000.fr", "network_address": "adonis-11.grenoble.grid5000.fr",
"rate": 40000000000, "rate": 40000000000,
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
"version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s" "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
}, },
{ {
"device": "eth0",
"enabled": true, "enabled": true,
"interface": "Ethernet", "interface": "Ethernet",
"ip": "172.16.16.141", "ip": "172.16.16.141",
...@@ -29,7 +31,9 @@ ...@@ -29,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-11-eth0.grenoble.grid5000.fr", "network_address": "adonis-11-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
} }
], ],
"operating_system": { "operating_system": {
......
...@@ -10,11 +10,12 @@ ...@@ -10,11 +10,12 @@
}, },
"network_adapters": [ "network_adapters": [
{ {
"device": "ib0",
"enabled": true, "enabled": true,
"interface": "InfiniBand", "interface": "InfiniBand",
"ip": "172.16.18.142", "ip": "172.16.18.142",
"management": false, "management": false,
"mountable": false, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-12.grenoble.grid5000.fr", "network_address": "adonis-12.grenoble.grid5000.fr",
"rate": 40000000000, "rate": 40000000000,
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
"version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s" "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT\/s"
}, },
{ {
"device": "eth0",
"enabled": true, "enabled": true,
"interface": "Ethernet", "interface": "Ethernet",
"ip": "172.16.16.142", "ip": "172.16.16.142",
...@@ -29,7 +31,9 @@ ...@@ -29,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-12-eth0.grenoble.grid5000.fr", "network_address": "adonis-12-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
} }
], ],
"operating_system": { "operating_system": {
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-2-eth0.grenoble.grid5000.fr", "network_address": "adonis-2-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-3-eth0.grenoble.grid5000.fr", "network_address": "adonis-3-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-4-eth0.grenoble.grid5000.fr", "network_address": "adonis-4-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-5-eth0.grenoble.grid5000.fr", "network_address": "adonis-5-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-6-eth0.grenoble.grid5000.fr", "network_address": "adonis-6-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-7-eth0.grenoble.grid5000.fr", "network_address": "adonis-7-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-8-eth0.grenoble.grid5000.fr", "network_address": "adonis-8-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
"mountable": true, "mountable": true,
"mounted": true, "mounted": true,
"network_address": "adonis-9-eth0.grenoble.grid5000.fr", "network_address": "adonis-9-eth0.grenoble.grid5000.fr",
"rate": 1000000000 "rate": 1000000000,
"vendor": "Intel",
"version": "Device 10c9 (rev 01)"
}, },
{ {
"device": "eth1", "device": "eth1",
......
...@@ -147,6 +147,7 @@ site :grenoble do |site_uid| ...@@ -147,6 +147,7 @@ site :grenoble do |site_uid|
:mounted => true, :mounted => true,
:mountable => true, :mountable => true,
:management => false, :management => false,
:vendor => 'Intel', :version => "Device 10c9 (rev 01)",
:network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
:ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr") :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
}, },
...@@ -207,9 +208,10 @@ site :grenoble do |site_uid| ...@@ -207,9 +208,10 @@ site :grenoble do |site_uid|
network_adapters [{ network_adapters [{
:interface => 'InfiniBand', :interface => 'InfiniBand',
:rate => 40.G, :rate => 40.G,
:device => "ib0",
:enabled => true, :enabled => true,
:mounted => true, :mounted => true,
:mountable => false, :mountable => true,
:management => false, :management => false,
:vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s", :vendor => 'Mellanox', :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
:network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
...@@ -218,10 +220,12 @@ site :grenoble do |site_uid| ...@@ -218,10 +220,12 @@ site :grenoble do |site_uid|
{ {
:interface => 'Ethernet', :interface => 'Ethernet',
:rate => 1.G, :rate => 1.G,
:device => "eth0",
:enabled => true, :enabled => true,
:mountable => true, :mountable => true,
:mounted => true, :mounted => true,
:management => false, :management => false,
:vendor => 'Intel', :version => "Device 10c9 (rev 01)",
:network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr", :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
:ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr") :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
}] }]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment