From 1fd918f9222838776ada89eeb050f8384a5320f0 Mon Sep 17 00:00:00 2001
From: Elodie Bertoncello <elodie.bertoncello@inria.fr>
Date: Thu, 29 Mar 2012 17:05:25 +0200
Subject: [PATCH] [Bordeaux] add mac bordeplage-49 MAC address

---
 Gemfile.lock                                  | 38 +++++++++++++++++++
 data/grid5000/sites/bordeaux/bordeaux.json    | 13 +------
 .../bordeplage/nodes/bordeplage-49.json       |  2 +-
 generators/input/bordeaux-bordeplage.yaml     |  2 +-
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 50f1ecdcdd..ee267ea662 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
+    backports (2.3.0)
+    bond (0.4.1)
+    json (1.6.5)
     json_pure (1.5.1)
+    mime-types (1.17.2)
     net-ssh (2.1.0)
+    rack (1.4.0)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rb-readline (0.4.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rest-client-components (1.2.0)
+      rack (>= 1.0.1)
+      rest-client (>= 1.6.0, < 1.7.0)
+    restfully (1.0.4)
+      addressable
+      backports
+      json (~> 1.5)
+      rack-cache
+      rb-readline
+      rest-client (~> 1.6)
+      rest-client-components
+      ripl
+      ripl-color_streams
+      ripl-multi_line
+      ripl-play (~> 0.2.1)
+      ripl-short_errors
+    ripl (0.6.0)
+      bond (~> 0.4.0)
+    ripl-color_streams (0.1.2)
+      ripl (>= 0.2.8)
+    ripl-multi_line (0.3.0)
+      ripl (>= 0.3.6)
+    ripl-play (0.2.1)
+      ripl (>= 0.3.0)
+    ripl-short_errors (0.1.0)
+      ripl (>= 0.2.8)
 
 PLATFORMS
   ruby
@@ -10,3 +47,4 @@ PLATFORMS
 DEPENDENCIES
   json_pure (~> 1.5)
   net-ssh
+  restfully (= 1.0.4)
diff --git a/data/grid5000/sites/bordeaux/bordeaux.json b/data/grid5000/sites/bordeaux/bordeaux.json
index 1f41eead36..b39445f3ab 100755
--- a/data/grid5000/sites/bordeaux/bordeaux.json
+++ b/data/grid5000/sites/bordeaux/bordeaux.json
@@ -1,15 +1,4 @@
 {
-  "compilation_server": false,
-  "description": "Grid5000 Bordeaux site",
-  "email_contact": "bordeaux-staff@lists.grid5000.fr",
-  "latitude": 44.833333,
-  "location": "Bordeaux, France",
-  "longitude": -0.566667,
-  "name": "Bordeaux",
-  "security_contact": "bordeaux-staff@lists.grid5000.fr",
-  "sys_admin_contact": "bordeaux-staff@lists.grid5000.fr",
   "type": "site",
-  "uid": "bordeaux",
-  "user_support_contact": "bordeaux-staff@lists.grid5000.fr",
-  "web": "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
+  "uid": "bordeaux"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index af1cc39e39..0cc97e0e32 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -25,7 +25,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.0.49",
-      "mac": null,
+      "mac": "00:14:22:0c:da:30",
       "management": false,
       "mountable": true,
       "mounted": true,
diff --git a/generators/input/bordeaux-bordeplage.yaml b/generators/input/bordeaux-bordeplage.yaml
index 0b35da9514..d860b34a49 100644
--- a/generators/input/bordeaux-bordeplage.yaml
+++ b/generators/input/bordeaux-bordeplage.yaml
@@ -1464,7 +1464,7 @@ bordeplage-49:
     ib1:
       guid:
     eth0:
-      mac:
+      mac: 00:14:22:0c:da:30
       ip: 172.16.0.49
     eth1:
       mac:
-- 
GitLab