From 287c2fea6630931275e53fd7ff7a12260fae5bd3 Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Wed, 21 Aug 2019 19:08:39 +0200
Subject: [PATCH] [grenoble] predictible interface name changed after bios
upgrade......
---
.../sites/grenoble/clusters/yeti/nodes/yeti-1.json | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-2.json | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-3.json | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-4.json | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-1.yaml | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-2.yaml | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-3.yaml | 8 ++++----
.../sites/grenoble/clusters/yeti/nodes/yeti-4.yaml | 8 ++++----
lib/refrepo/net_names_mapping.yaml | 8 ++++----
9 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
index e3ed4f837af..4401cbd10e1 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -59,7 +59,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": true,
"mounted": true,
- "name": "eno113",
+ "name": "eno1",
"network_address": "yeti-1.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
@@ -78,7 +78,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno114",
+ "name": "eno2",
"vendor": "Intel"
},
{
@@ -93,7 +93,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno115",
+ "name": "eno3",
"vendor": "Intel"
},
{
@@ -108,7 +108,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno116",
+ "name": "eno4",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
index 998060a476d..b1fbee35b0b 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -59,7 +59,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": true,
"mounted": true,
- "name": "eno113",
+ "name": "eno1",
"network_address": "yeti-2.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
@@ -78,7 +78,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno114",
+ "name": "eno2",
"vendor": "Intel"
},
{
@@ -93,7 +93,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno115",
+ "name": "eno3",
"vendor": "Intel"
},
{
@@ -108,7 +108,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno116",
+ "name": "eno4",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
index 974b5f34aec..201f09ed483 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -59,7 +59,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": true,
"mounted": true,
- "name": "eno113",
+ "name": "eno1",
"network_address": "yeti-3.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
@@ -78,7 +78,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno114",
+ "name": "eno2",
"vendor": "Intel"
},
{
@@ -93,7 +93,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno115",
+ "name": "eno3",
"vendor": "Intel"
},
{
@@ -108,7 +108,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno116",
+ "name": "eno4",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
index acf6f911d9e..af4022833c4 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -59,7 +59,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": true,
"mounted": true,
- "name": "eno113",
+ "name": "eno1",
"network_address": "yeti-4.grenoble.grid5000.fr",
"rate": 10000000000,
"switch": "gw",
@@ -78,7 +78,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno114",
+ "name": "eno2",
"vendor": "Intel"
},
{
@@ -93,7 +93,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno115",
+ "name": "eno3",
"vendor": "Intel"
},
{
@@ -108,7 +108,7 @@
"model": "Ethernet Controller X710 for 10GbE SFP+",
"mountable": false,
"mounted": false,
- "name": "eno116",
+ "name": "eno4",
"vendor": "Intel"
},
{
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 3ed87feeded..720880a64ad 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -29,7 +29,7 @@ yeti-1:
mac: 24:6e:96:91:1e:b0
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno113
+ name: eno1
rate: 10000000000
vendor: Intel
eth1:
@@ -39,7 +39,7 @@ yeti-1:
mac: 24:6e:96:91:1e:b2
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno114
+ name: eno2
vendor: Intel
eth2:
driver: i40e
@@ -48,7 +48,7 @@ yeti-1:
mac: 24:6e:96:91:1e:b4
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno115
+ name: eno3
vendor: Intel
eth3:
driver: i40e
@@ -57,7 +57,7 @@ yeti-1:
mac: 24:6e:96:91:1e:b6
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno116
+ name: eno4
vendor: Intel
ib0:
driver: hfi1
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index dfddc3e0b34..a45a31f0329 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -29,7 +29,7 @@ yeti-2:
mac: 24:6e:96:91:2b:50
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno113
+ name: eno1
rate: 10000000000
vendor: Intel
eth1:
@@ -39,7 +39,7 @@ yeti-2:
mac: 24:6e:96:91:2b:52
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno114
+ name: eno2
vendor: Intel
eth2:
driver: i40e
@@ -48,7 +48,7 @@ yeti-2:
mac: 24:6e:96:91:2b:54
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno115
+ name: eno3
vendor: Intel
eth3:
driver: i40e
@@ -57,7 +57,7 @@ yeti-2:
mac: 24:6e:96:91:2b:56
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno116
+ name: eno4
vendor: Intel
ib0:
driver: hfi1
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index bbdd7a27547..c47233129e2 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -29,7 +29,7 @@ yeti-3:
mac: 24:6e:96:91:4c:90
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno113
+ name: eno1
rate: 10000000000
vendor: Intel
eth1:
@@ -39,7 +39,7 @@ yeti-3:
mac: 24:6e:96:91:4c:92
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno114
+ name: eno2
vendor: Intel
eth2:
driver: i40e
@@ -48,7 +48,7 @@ yeti-3:
mac: 24:6e:96:91:4c:94
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno115
+ name: eno3
vendor: Intel
eth3:
driver: i40e
@@ -57,7 +57,7 @@ yeti-3:
mac: 24:6e:96:91:4c:96
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno116
+ name: eno4
vendor: Intel
ib0:
driver: hfi1
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index f7d77929ab6..72d6f5ec50e 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -29,7 +29,7 @@ yeti-4:
mac: 24:6e:96:91:1d:b0
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno113
+ name: eno1
rate: 10000000000
vendor: Intel
eth1:
@@ -39,7 +39,7 @@ yeti-4:
mac: 24:6e:96:91:1d:b2
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno114
+ name: eno2
vendor: Intel
eth2:
driver: i40e
@@ -48,7 +48,7 @@ yeti-4:
mac: 24:6e:96:91:1d:b4
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno115
+ name: eno3
vendor: Intel
eth3:
driver: i40e
@@ -57,7 +57,7 @@ yeti-4:
mac: 24:6e:96:91:1d:b6
management: false
model: Ethernet Controller X710 for 10GbE SFP+
- name: eno116
+ name: eno4
vendor: Intel
ib0:
driver: hfi1
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index cc4c1212d8e..63b28249a13 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -154,10 +154,10 @@ uvb:
eno1: eth0
eno2: eth1
yeti:
- eno113: eth0
- eno114: eth1
- eno115: eth2
- eno116: eth3
+ eno1: eth0
+ eno2: eth1
+ eno3: eth2
+ eno4: eth3
#Manual entries for nodes which mapping is different from cluster default
granduc-12:
--
GitLab