Commit 7eabc0c4 authored by PARISOT Clement's avatar PARISOT Clement
Browse files

[nancy] grisou - Fix ethnb, number of interfaces

parent 55bb54f7
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:11:fa",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4b:7c",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4b:7e",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0b:ba",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4b:4c",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4b:4e",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:09:e2",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4e:98",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4e:9a",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0c:12",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4e:d8",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4e:da",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0d:6a",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4e:e4",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4e:e6",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:10:1a",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4d:e0",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4d:e2",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0a:42",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4a:48",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4a:4a",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0d:52",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4c:c8",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4c:ca",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0e:82",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth2",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4d:cc",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth3",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4d:ce",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:0b:a2",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth4",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4c:24",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth5",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4c:26",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -44,7 +44,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth1",
"driver": "ixgbe",
"enabled": false,
......@@ -52,7 +52,7 @@
"mac": "24:6e:96:03:24:22",
"management": false,
"model": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -60,7 +60,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth4",
"driver": "ixgbe",
"enabled": false,
......@@ -68,7 +68,7 @@
"mac": "a0:36:9f:7e:4c:e8",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......@@ -76,7 +76,7 @@
"vendor": "Intel Corporation"
},
{
"bridged": true,
"bridged": false,
"device": "eth5",
"driver": "ixgbe",
"enabled": false,
......@@ -84,7 +84,7 @@
"mac": "a0:36:9f:7e:4c:ea",
"management": false,
"model": "Ethernet 10G 2P X520 Adapter",
"mountable": true,
"mountable": false,
"mounted": false,
"rate": 10000000000,
"switch": null,
......
......@@ -73,8 +73,8 @@ site :nancy do |site_uid|
:rev => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
:storage => 'HDD'
}]
if (i != 49 and i != 50) then
# Nodes with 4 interfaces
if (i <= 39) then
network_adapters [{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
......@@ -185,7 +185,8 @@ site :nancy do |site_uid|
:management => true,
:device => "bmc"
}]
else
# Node with 1 interface
elsif (i != 49 and i != 50) then
network_adapters [{
:interface => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
:rate => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
......@@ -209,9 +210,121 @@ site :nancy do |site_uid|
:rate => 10.G,
:enabled => false,
:management => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),