From b1fbcb73939c738aec47d5a61359c679867bebbb Mon Sep 17 00:00:00 2001
From: Elodie Bertoncello <elodie.bertoncello@inria.fr>
Date: Thu, 14 Jun 2012 17:59:10 +0200
Subject: [PATCH] [grenoble] change edel-2 mac address

---
 .../sites/grenoble/clusters/edel/nodes/edel-2.json  |  2 +-
 data/grid5000/sites/grenoble/grenoble.json          | 13 +------------
 generators/input/sites/grenoble/clusters/edel.yaml  |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index 82bf9cbd648..d75e59026ff 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -53,7 +53,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.52",
-      "mac": "08:00:38:35:ac:06",
+      "mac": "08:00:38:36:f5:a8",
       "management": false,
       "mountable": true,
       "mounted": true,
diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json
index 66bd1596b21..f6e279f293c 100755
--- a/data/grid5000/sites/grenoble/grenoble.json
+++ b/data/grid5000/sites/grenoble/grenoble.json
@@ -1,15 +1,4 @@
 {
-  "compilation_server": false,
-  "description": "Grid'5000 Grenoble site",
-  "email_contact": "grenoble-staff@lists.grid5000.fr",
-  "latitude": 45.1833,
-  "location": "Grenoble, France",
-  "longitude": 5.7167,
-  "name": "Grenoble",
-  "security_contact": "grenoble-staff@lists.grid5000.fr",
-  "sys_admin_contact": "grenoble-staff@lists.grid5000.fr",
   "type": "site",
-  "uid": "grenoble",
-  "user_support_contact": "grenoble-staff@lists.grid5000.fr",
-  "web": "http://www.grid5000.fr/mediawiki/index.php/Grenoble:Home"
+  "uid": "grenoble"
 }
\ No newline at end of file
diff --git a/generators/input/sites/grenoble/clusters/edel.yaml b/generators/input/sites/grenoble/clusters/edel.yaml
index dce31ef79c7..a8167b3d92e 100644
--- a/generators/input/sites/grenoble/clusters/edel.yaml
+++ b/generators/input/sites/grenoble/clusters/edel.yaml
@@ -48,7 +48,7 @@ edel-2:
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
     eth0:
-      mac: 08:00:38:35:ac:06
+      mac: 08:00:38:36:f5:a8
       ip: 172.16.16.52
     eth1:
       mac: 08:00:38:35:ac:07
-- 
GitLab