Commit 966be0e2 authored by Marc Pinhede's avatar Marc Pinhede

[nancy] change mac addresss for graphene-28 (my mistake, re-doing emorel...

[nancy] change mac addresss for graphene-28 (my mistake, re-doing emorel commit that I accidentally reverted)
parent e9e3eadb
......@@ -29,8 +29,8 @@
"enabled": true,
"interface": "Ethernet",
"ip": "172.16.64.28",
"ip6": "fe80::2e0:81ff:fed5:07f0",
"mac": "00:e0:81:d5:07:f0",
"ip6": "fe80::2e0:81ff:fed5:65c",
"mac": "00:e0:81:d5:06:5c",
"management": false,
"mountable": true,
"mounted": true,
......@@ -47,7 +47,7 @@
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
"mac": "00:e0:81:d5:07:f1",
"mac": "00:e0:81:d5:06:5d",
"management": false,
"mountable": false,
"mounted": false,
......@@ -61,7 +61,7 @@
"driver": "e1000e",
"enabled": false,
"interface": "Ethernet",
"mac": "00:e0:81:d5:07:f2",
"mac": "00:e0:81:d5:06:5e",
"management": false,
"mountable": false,
"mounted": false,
......
......@@ -2541,8 +2541,8 @@ graphene-28:
eth0:
mounted: true
rate: 1000000000
mac: 00:e0:81:d5:07:f0
ip6: fe80::2e0:81ff:fed5:07f0
mac: 00:e0:81:d5:06:5c
ip6: fe80::2e0:81ff:fed5:65c
management: false
enabled: true
interface: Ethernet
......@@ -2552,7 +2552,7 @@ graphene-28:
eth1:
mounted: false
rate: 100000000
mac: 00:e0:81:d5:07:f1
mac: 00:e0:81:d5:06:5d
management: false
enabled: false
interface: Ethernet
......@@ -2560,7 +2560,7 @@ graphene-28:
mountable: false
eth2:
mounted: false
mac: 00:e0:81:d5:07:f2
mac: 00:e0:81:d5:06:5e
management: false
enabled: false
interface: Ethernet
......
......@@ -21,8 +21,8 @@ module Grid5000
h['cluster'] = cluster.properties['uid']
h['nodemodel'] = cluster.properties['model']
h['switch'] = main_network_adapter['switch']
#h['besteffort'] = properties['supported_job_types']['besteffort'] ? "YES" : "NO"
#h['deploy'] = properties['supported_job_types']['deploy'] ? "YES" : "NO"
h['besteffort'] = properties['supported_job_types']['besteffort'] ? "YES" : "NO"
h['deploy'] = properties['supported_job_types']['deploy'] ? "YES" : "NO"
h['ip_virtual'] = properties['supported_job_types']['virtual'] ? "YES" : "NO"
h['virtual'] = properties['supported_job_types']['virtual']
h['cpuarch'] = properties['architecture']['platform_type']
......@@ -30,7 +30,7 @@ module Grid5000
h['cputype'] = [properties['processor']['model'], properties['processor']['version']].join(" ")
h['cpufreq'] = properties['processor']['clock_speed']/1_000_000_000
h['disktype'] = (properties['storage_devices'].first || {})['interface']
h['ethnb'] = properties["network_adapters"].select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mountable'] == true}.length
h['ethnb'] = properties["network_adapters"].select{|na| na['interface'] =~ /ethernet/i}.length
ib10g = properties['network_adapters'].detect{|na| na['interface'] =~ /infiniband/i && na['rate'] == 10_000_000_000}
h['ib10g'] = ib10g.nil? ? "NO" : "YES"
h['ib10gmodel'] = ib10g.nil? ? "none" : ib10g['version']
......
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