Merge branch 'master' of g5kadmin@git.grid5000.fr:/srv/git/repos/reference-repository

d1137fea · Cyril Rohr · e258d54f · f3d54eb7 · d1137fea · d1137fea
Commit d1137fea authored Jul 06, 2009 by Cyril Rohr
--- a/data/grid5000/environments/lenny-x64-base-1.0.json
+++ b/data/grid5000/environments/lenny-x64-base-1.0.json
@@ -30,7 +30,7 @@
    "md5": null,
    "path": "\/grid5000\/images\/lenny-x64-base-1.0.tgz"
  },
-  "kernel": null,
+  "kernel": "2.6.26.2",
  "max_open_files": 8192,
  "services": [


--- a/data/grid5000/environments/lenny-x64-big-1.0.json
+++ b/data/grid5000/environments/lenny-x64-big-1.0.json
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "b2e48586472579ac2b908816175e4aa6",
+    "path": "\/grid5000\/images\/lenny-x64-big-1.0.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+    "ldap",
+    "nfs"
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
+}
\ No newline at end of file
--- a/data/grid5000/environments/lenny-x64-nfs-1.0.json
+++ b/data/grid5000/environments/lenny-x64-nfs-1.0.json
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "89448d214db5477e3ac6ef39ed0e7f6e",
+    "path": "\/grid5000\/images\/lenny-x64-nfs-1.0.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+    "ldap",
+    "nfs"
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
+}
\ No newline at end of file
--- a/data/grid5000/environments/lenny-x64-xen-1.0.json
+++ b/data/grid5000/environments/lenny-x64-xen-1.0.json
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version etch for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "3e292c686c3ed0b417e44fdde5ec1771",
+    "path": "\/grid5000\/images\/lenny-x64-xen-1.0.tgz"
+  },
+  "kernel": "2.6.26-2-xen-amd64",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "testing",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-xen-1.0",
+  "valid_on": "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM x3455, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100, Altix Xe 310",
+  "x11_forwarding": true
+}
\ No newline at end of file
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHR4",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHP7",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHN9",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHNB",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHND",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHNE",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHNJ",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHL7",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHL1",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHLA",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHLC",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHLH",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHP9",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHLW",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHLM",
  "storage_devices": [
    {
      "driver": "ata_piix",

--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
@@ -65,6 +65,7 @@
    "vendor": "Intel",
    "version": "5110"
  },
+  "serial": "GB8649YHLY",
  "storage_devices": [
    {
      "driver": "ata_piix",