diff --git a/Gemfile.lock b/Gemfile.lock index 50f1ecdcddc992d0c32339703a17fb5836bc37ea..ee267ea66258e0589e43625ef6c7168fd8dffaec 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 1f41eead3628d67bada08a6a85af9c35d1354b00..b39445f3ab811349204f69696774d7643f3d1207 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 af1cc39e396dc42b64132ac4734ec3002912a8af..0cc97e0e325c13100df4783b3689b195290716d3 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 0b35da95145d3abdf6445956ae5cfc304f13e9c1..d860b34a498e89fd502b00d8262cb9ce1eddb2c1 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: