Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
grid5000
reference-repository
Commits
1c23a8c5
Commit
1c23a8c5
authored
Sep 30, 2010
by
Guillaume Ranquet
Committed by
g5kadmin user
Sep 30, 2010
Browse files
[bordeaux] switch back borderline-[1-4] network cards, fixes bug 2681
parent
ee09542b
Changes
5
Hide whitespace changes
Inline
Side-by-side
data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
View file @
1c23a8c5
...
...
@@ -40,31 +40,31 @@
"version"
:
"NetXtreme II BCM5708"
},
{
"device"
:
"
myr
i0"
,
"device"
:
"i
b
0"
,
"driver"
:
"ib_mthca"
,
"enabled"
:
true
,
"interface"
:
"
Myrinet
"
,
"ip"
:
"172.16.
3
.196"
,
"interface"
:
"
InfiniBand
"
,
"ip"
:
"172.16.
4
.196"
,
"mac"
:
""
,
"management"
:
false
,
"mountable"
:
true
,
"mounted"
:
true
,
"network_address"
:
"borderline-1-
myr
i0.bordeaux.grid5000.fr"
,
"network_address"
:
"borderline-1-i
b
0.bordeaux.grid5000.fr"
,
"rate"
:
10000000000
,
"vendor"
:
"M
yrinet
"
,
"version"
:
"
10G-PCIE-8A-C
"
"vendor"
:
"M
ellanox
"
,
"version"
:
"
InfiniHost MT25208
"
},
{
"device"
:
"myri
1
"
,
"device"
:
"myri
0
"
,
"driver"
:
"ib_mthca"
,
"enabled"
:
true
,
"interface"
:
"Myrinet"
,
"ip"
:
"172.16.3.19
9
"
,
"ip"
:
"172.16.3.19
6
"
,
"mac"
:
""
,
"management"
:
false
,
"mountable"
:
true
,
"mounted"
:
true
,
"network_address"
:
"borderline-
4
-myri0.bordeaux.grid5000.fr"
,
"network_address"
:
"borderline-
1
-myri0.bordeaux.grid5000.fr"
,
"rate"
:
10000000000
,
"vendor"
:
"Myrinet"
,
"version"
:
"10G-PCIE-8A-C"
...
...
data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
View file @
1c23a8c5
...
...
@@ -40,31 +40,31 @@
"version"
:
"NetXtreme II BCM5708"
},
{
"device"
:
"
myr
i0"
,
"device"
:
"i
b
0"
,
"driver"
:
"ib_mthca"
,
"enabled"
:
true
,
"interface"
:
"
Myrinet
"
,
"ip"
:
"172.16.
3
.197"
,
"interface"
:
"
InfiniBand
"
,
"ip"
:
"172.16.
4
.197"
,
"mac"
:
""
,
"management"
:
false
,
"mountable"
:
true
,
"mounted"
:
true
,
"network_address"
:
"borderline-2-
myr
i0.bordeaux.grid5000.fr"
,
"network_address"
:
"borderline-2-i
b
0.bordeaux.grid5000.fr"
,
"rate"
:
10000000000
,
"vendor"
:
"M
yrinet
"
,
"version"
:
"
10G-PCIE-8A-C
"
"vendor"
:
"M
ellanox
"
,
"version"
:
"
InfiniHost MT25208
"
},
{
"device"
:
"myri
1
"
,
"device"
:
"myri
0
"
,
"driver"
:
"ib_mthca"
,
"enabled"
:
true
,
"interface"
:
"Myrinet"
,
"ip"
:
"172.16.3.19
8
"
,
"ip"
:
"172.16.3.19
7
"
,
"mac"
:
""
,
"management"
:
false
,
"mountable"
:
true
,
"mounted"
:
true
,
"network_address"
:
"borderline-
3
-myri0.bordeaux.grid5000.fr"
,
"network_address"
:
"borderline-
2
-myri0.bordeaux.grid5000.fr"
,
"rate"
:
10000000000
,
"vendor"
:
"Myrinet"
,
"version"
:
"10G-PCIE-8A-C"
...
...
data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
View file @
1c23a8c5
...
...
@@ -55,19 +55,19 @@
"version"
:
"InfiniHost MT25208"
},
{
"device"
:
"
ib1
"
,
"device"
:
"
myri0
"
,
"driver"
:
"ib_mthca"
,
"enabled"
:
true
,
"interface"
:
"
InfiniBand
"
,
"ip"
:
"172.16.
4
.19
6
"
,
"interface"
:
"
Myrinet
"
,
"ip"
:
"172.16.
3
.19
8
"
,
"mac"
:
""
,
"management"
:
false
,
"mountable"
:
true
,
"mounted"
:
true
,
"network_address"
:
"borderline-
1-ib
0.bordeaux.grid5000.fr"
,
"network_address"
:
"borderline-
3-myri
0.bordeaux.grid5000.fr"
,
"rate"
:
10000000000
,
"vendor"
:
"M
ellanox
"
,
"version"
:
"
InfiniHost MT25208
"
"vendor"
:
"M
yrinet
"
,
"version"
:
"
10G-PCIE-8A-C
"
}
],
"operating_system"
:
{
...
...
data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
View file @
1c23a8c5
...
...
@@ -55,19 +55,19 @@
"version"
:
"InfiniHost MT25208"
},
{
"device"
:
"
ib1
"
,
"device"
:
"
myri0
"
,
"driver"
:
"ib_mthca"
,
"enabled"
:
true
,
"interface"
:
"
InfiniBand
"
,
"ip"
:
"172.16.
4
.19
7
"
,
"interface"
:
"
Myrinet
"
,
"ip"
:
"172.16.
3
.19
9
"
,
"mac"
:
""
,
"management"
:
false
,
"mountable"
:
true
,
"mounted"
:
true
,
"network_address"
:
"borderline-
2-ib
0.bordeaux.grid5000.fr"
,
"network_address"
:
"borderline-
4-myri
0.bordeaux.grid5000.fr"
,
"rate"
:
10000000000
,
"vendor"
:
"M
ellanox
"
,
"version"
:
"
InfiniHost MT25208
"
"vendor"
:
"M
yrinet
"
,
"version"
:
"
10G-PCIE-8A-C
"
}
],
"operating_system"
:
{
...
...
generators/input/bordeaux.rb
View file @
1c23a8c5
...
...
@@ -167,8 +167,7 @@ site :bordeaux do |site_uid|
storage_devices
[
{
:interface
=>
'SAS'
,
:size
=>
600
.
GB
,
:driver
=>
nil
}
]
ifs
=
Array
.
new
ifs
+=
[
network_adapters
[
{
:interface
=>
'Ethernet'
,
:rate
=>
1
.
G
,
:network_address
=>
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
"Broadcom"
,
:version
=>
"NetXtreme II BCM5708"
,
...
...
@@ -178,48 +177,18 @@ site :bordeaux do |site_uid|
:network_address
=>
"
#{
node_uid
}
-eth1.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-eth1.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
"Broadcom"
,
:version
=>
"NetXtreme II BCM5708"
,
:enabled
=>
true
,
:mounted
=>
false
,
:mountable
=>
true
,
:driver
=>
"bnx2"
,
:management
=>
false
,
:device
=>
"eth1"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"eth1"
)}
]
#some cards have been swapped between hosts - refer to bug 2681 for explanations
if
i
==
2
or
i
==
3
ifs
+=
[
{
:interface
=>
'InfiniBand'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
node_uid
}
-ib0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-ib0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Mellanox'
,
:version
=>
"InfiniHost MT25208"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"ib0"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"ib0"
)},
{
:interface
=>
'InfiniBand'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
cluster_uid
}
-
#{
i
-
1
}
-ib0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
cluster_uid
}
-
#{
i
-
1
}
-ib0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Mellanox'
,
:version
=>
"InfiniHost MT25208"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"ib1"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"ib0"
)}]
elsif
i
==
0
or
i
==
1
ifs
+=
[
{
:interface
=>
'Myrinet'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
node_uid
}
-myri0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-myri0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Myrinet'
,
:version
=>
"10G-PCIE-8A-C"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"myri0"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"myri0"
)},
{
:interface
=>
'Myrinet'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
cluster_uid
}
-
#{
(
i
-
2
)
-
(
i
-
3
)
*
2
}
-myri0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
cluster_uid
}
-
#{
(
i
-
2
)
-
(
i
-
3
)
*
2
}
-myri0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Myrinet'
,
:version
=>
"10G-PCIE-8A-C"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"myri1"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"myri1"
)}]
else
ifs
+=
[
{
:interface
=>
'InfiniBand'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
node_uid
}
-ib0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-ib0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Mellanox'
,
:version
=>
"InfiniHost MT25208"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"ib0"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"ib0"
)},
{
:interface
=>
'Myrinet'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
node_uid
}
-myri0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-myri0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Myrinet'
,
:version
=>
"10G-PCIE-8A-C"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"myri0"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"myri0"
)}]
end
network_adapters
ifs
end
end
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"eth1"
)},
{
:interface
=>
'InfiniBand'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
node_uid
}
-ib0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-ib0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Mellanox'
,
:version
=>
"InfiniHost MT25208"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"ib0"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"ib0"
)},
{
:interface
=>
'Myrinet'
,
:rate
=>
10
.
G
,
:network_address
=>
"
#{
node_uid
}
-myri0.
#{
site_uid
}
.grid5000.fr"
,
:ip
=>
dns_lookup
(
"
#{
node_uid
}
-myri0.
#{
site_uid
}
.grid5000.fr"
),
:vendor
=>
'Myrinet'
,
:version
=>
"10G-PCIE-8A-C"
,
:enabled
=>
true
,
:mountable
=>
true
,
:mounted
=>
true
,
:driver
=>
"ib_mthca"
,
:management
=>
false
,
:device
=>
"myri0"
,
:mac
=>
get_macaddr
(
"
#{
node_uid
}
.
#{
site_uid
}
.grid5000.fr"
,
"myri0"
)}]
end
end
end
# cluster borderline
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment