From d00d5a6d48d10f926dbb5d9e8e3c8c957debc94f Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Tue, 17 Feb 2015 14:04:56 +0100
Subject: [PATCH] [nantes] Add environments

---
 .../environments/squeeze-x64-base-1.8.json    |  4 +--
 .../environments/squeeze-x64-big-1.10.json    |  4 +--
 .../environments/squeeze-x64-min-1.10.json    |  4 +--
 .../environments/squeeze-x64-nfs-1.10.json    |  4 +--
 .../environments/wheezy-x64-base-1.3.json     |  4 +--
 .../environments/wheezy-x64-big-1.3.json      |  4 +--
 .../environments/wheezy-x64-min-1.4.json      | 34 +++++++++++++++++++
 .../environments/wheezy-x64-nfs-1.3.json      |  4 +--
 .../environments/wheezy-x64-xen-1.3.json      |  4 +--
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../lyon/environments/wheezy-x64-min-1.4.json |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/squeeze-x64-base-1.8.json    |  1 +
 .../environments/squeeze-x64-big-1.10.json    |  1 +
 .../environments/squeeze-x64-min-1.10.json    |  1 +
 .../environments/squeeze-x64-nfs-1.10.json    |  1 +
 .../environments/wheezy-x64-base-1.3.json     |  1 +
 .../environments/wheezy-x64-big-1.3.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/wheezy-x64-nfs-1.3.json      |  1 +
 .../environments/wheezy-x64-xen-1.3.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/wheezy-x64-min-1.4.json      |  1 +
 .../environments/squeeze-x64-base-1.8.rb      |  4 +--
 .../environments/squeeze-x64-big-1.10.rb      |  4 +--
 .../environments/squeeze-x64-min-1.10.rb      |  4 +--
 .../environments/squeeze-x64-nfs-1.10.rb      |  4 +--
 .../input/environments/wheezy-x64-base-1.3.rb |  4 +--
 .../input/environments/wheezy-x64-big-1.3.rb  |  4 +--
 .../input/environments/wheezy-x64-min-1.4.rb  |  4 +--
 .../input/environments/wheezy-x64-nfs-1.3.rb  |  4 +--
 .../input/environments/wheezy-x64-xen-1.3.rb  |  4 +--
 36 files changed, 86 insertions(+), 34 deletions(-)
 create mode 100644 data/grid5000/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json
 create mode 120000 data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json
 create mode 120000 data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json
 create mode 120000 data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json
 create mode 120000 data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json
 create mode 120000 data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json
 create mode 120000 data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json
 create mode 120000 data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json
 create mode 120000 data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json
 create mode 120000 data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json

diff --git a/data/grid5000/environments/squeeze-x64-base-1.8.json b/data/grid5000/environments/squeeze-x64-base-1.8.json
index a8b80d92b77..6add4024f18 100644
--- a/data/grid5000/environments/squeeze-x64-base-1.8.json
+++ b/data/grid5000/environments/squeeze-x64-base-1.8.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "squeeze-x64-base-1.8",
-  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-big-1.10.json b/data/grid5000/environments/squeeze-x64-big-1.10.json
index 39ce8a7e46c..90e071edc89 100644
--- a/data/grid5000/environments/squeeze-x64-big-1.10.json
+++ b/data/grid5000/environments/squeeze-x64-big-1.10.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "squeeze-x64-big-1.10",
-  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-min-1.10.json b/data/grid5000/environments/squeeze-x64-min-1.10.json
index 5e45e4af93b..35231a259cf 100644
--- a/data/grid5000/environments/squeeze-x64-min-1.10.json
+++ b/data/grid5000/environments/squeeze-x64-min-1.10.json
@@ -29,6 +29,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "squeeze-x64-min-1.10",
-  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-nfs-1.10.json b/data/grid5000/environments/squeeze-x64-nfs-1.10.json
index a9adc3edd9b..23d0b4d9464 100644
--- a/data/grid5000/environments/squeeze-x64-nfs-1.10.json
+++ b/data/grid5000/environments/squeeze-x64-nfs-1.10.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "squeeze-x64-nfs-1.10",
-  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-base-1.3.json b/data/grid5000/environments/wheezy-x64-base-1.3.json
index acd12f239c4..f838cefbd02 100644
--- a/data/grid5000/environments/wheezy-x64-base-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-base-1.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "wheezy-x64-base-1.3",
-  "valid_on": "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-big-1.3.json b/data/grid5000/environments/wheezy-x64-big-1.3.json
index 6fc79f742e9..9aba17ec462 100644
--- a/data/grid5000/environments/wheezy-x64-big-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-big-1.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "wheezy-x64-big-1.3",
-  "valid_on": "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-min-1.4.json b/data/grid5000/environments/wheezy-x64-min-1.4.json
new file mode 100644
index 00000000000..6123bec584c
--- /dev/null
+++ b/data/grid5000/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1,34 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "nano",
+    "Perl"
+  ],
+  "based_on": "Debian version wheezy for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "206ce5c1a3cd856a4463c0a48324377f",
+    "path": "/grid5000/images/wheezy-x64-min-1.4.tgz"
+  },
+  "kernel": "3.2.0-4",
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "wheezy-x64-min-1.4",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-nfs-1.3.json b/data/grid5000/environments/wheezy-x64-nfs-1.3.json
index 0f3e85b2139..d3316ac794f 100644
--- a/data/grid5000/environments/wheezy-x64-nfs-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-nfs-1.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "wheezy-x64-nfs-1.3",
-  "valid_on": "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/wheezy-x64-xen-1.3.json b/data/grid5000/environments/wheezy-x64-xen-1.3.json
index 1c4416ea7e6..6a78c5ecf12 100644
--- a/data/grid5000/environments/wheezy-x64-xen-1.3.json
+++ b/data/grid5000/environments/wheezy-x64-xen-1.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "wheezy-x64-xen-1.3",
-  "valid_on": "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , sol , suno, pastel",
+  "valid_on": "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel",
   "x11_forwarding": true
-}
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/luxembourg/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json b/data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json
new file mode 120000
index 00000000000..e0f02f1e05b
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-base-1.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json b/data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json
new file mode 120000
index 00000000000..c48dbba880b
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-big-1.10.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json b/data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json
new file mode 120000
index 00000000000..45372dc35eb
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-min-1.10.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json b/data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json
new file mode 120000
index 00000000000..0e785d83b16
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/squeeze-x64-nfs-1.10.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json
new file mode 120000
index 00000000000..3fd75f32736
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-base-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-base-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json
new file mode 120000
index 00000000000..ea4b4aa5761
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-big-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-big-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json
new file mode 120000
index 00000000000..97c6137286c
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-nfs-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-nfs-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json b/data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json
new file mode 120000
index 00000000000..c843ebd1986
--- /dev/null
+++ b/data/grid5000/sites/nantes/environments/wheezy-x64-xen-1.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-xen-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/reims/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json
new file mode 120000
index 00000000000..29aa77b8b72
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/generators/input/environments/squeeze-x64-base-1.8.rb b/generators/input/environments/squeeze-x64-base-1.8.rb
index c76f9b643eb..b7ef8d3844a 100644
--- a/generators/input/environments/squeeze-x64-base-1.8.rb
+++ b/generators/input/environments/squeeze-x64-base-1.8.rb
@@ -2,8 +2,8 @@ environment 'squeeze-x64-base-1.8' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-base-1.8.tgz", :md5 => "2f4f9fcf23c2107f78ac698477e20b7b"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/squeeze-x64-big-1.10.rb b/generators/input/environments/squeeze-x64-big-1.10.rb
index 4aafdd99c71..f2bcbb29b21 100644
--- a/generators/input/environments/squeeze-x64-big-1.10.rb
+++ b/generators/input/environments/squeeze-x64-big-1.10.rb
@@ -2,8 +2,8 @@ environment 'squeeze-x64-big-1.10' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-big-1.10.tgz", :md5 => "30db05a58d411632dd90f2e53f975e38"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/squeeze-x64-min-1.10.rb b/generators/input/environments/squeeze-x64-min-1.10.rb
index 2795e0ffea3..879a7db49a3 100644
--- a/generators/input/environments/squeeze-x64-min-1.10.rb
+++ b/generators/input/environments/squeeze-x64-min-1.10.rb
@@ -2,8 +2,8 @@ environment 'squeeze-x64-min-1.10' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-min-1.10.tgz", :md5 => "cd391bacce38beaf2707c5b32111012c"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/squeeze-x64-nfs-1.10.rb b/generators/input/environments/squeeze-x64-nfs-1.10.rb
index 6cdc83a2e34..5656ef4a5c4 100644
--- a/generators/input/environments/squeeze-x64-nfs-1.10.rb
+++ b/generators/input/environments/squeeze-x64-nfs-1.10.rb
@@ -2,8 +2,8 @@ environment 'squeeze-x64-nfs-1.10' do
   state "stable"
   file({:path => "/grid5000/images/squeeze-x64-nfs-1.10.tgz", :md5 => "adf1dbd13591832451ffa9ab975b7bbb"})
   kernel "2.6.32-5"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , econome, stremi , parapide , parapluie , paranoia, helios , sol , suno, pastel"
   based_on "Debian version squeeze for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/wheezy-x64-base-1.3.rb b/generators/input/environments/wheezy-x64-base-1.3.rb
index 004a195b18a..fc5d81b2a8b 100644
--- a/generators/input/environments/wheezy-x64-base-1.3.rb
+++ b/generators/input/environments/wheezy-x64-base-1.3.rb
@@ -2,8 +2,8 @@ environment 'wheezy-x64-base-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-base-1.3.tgz", :md5 => "d1562fb20a4a787ed11936715450c9d1"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/wheezy-x64-big-1.3.rb b/generators/input/environments/wheezy-x64-big-1.3.rb
index 9c6c2b51c94..f16ecdacc79 100644
--- a/generators/input/environments/wheezy-x64-big-1.3.rb
+++ b/generators/input/environments/wheezy-x64-big-1.3.rb
@@ -2,8 +2,8 @@ environment 'wheezy-x64-big-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-big-1.3.tgz", :md5 => "774bdf59cb2bdc478c4b420d738aae8d"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/wheezy-x64-min-1.4.rb b/generators/input/environments/wheezy-x64-min-1.4.rb
index ddea0efbe8c..0e5ac0d5df6 100644
--- a/generators/input/environments/wheezy-x64-min-1.4.rb
+++ b/generators/input/environments/wheezy-x64-min-1.4.rb
@@ -2,8 +2,8 @@ environment 'wheezy-x64-min-1.4' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-min-1.4.tgz", :md5 => "206ce5c1a3cd856a4463c0a48324377f"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/wheezy-x64-nfs-1.3.rb b/generators/input/environments/wheezy-x64-nfs-1.3.rb
index ff240b01be9..a40d77f8a85 100644
--- a/generators/input/environments/wheezy-x64-nfs-1.3.rb
+++ b/generators/input/environments/wheezy-x64-nfs-1.3.rb
@@ -2,8 +2,8 @@ environment 'wheezy-x64-nfs-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-nfs-1.3.tgz", :md5 => "b327d3150ef6f625f88ed65b08048cf9"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , helios , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
diff --git a/generators/input/environments/wheezy-x64-xen-1.3.rb b/generators/input/environments/wheezy-x64-xen-1.3.rb
index 716b61e6608..3547dcaac9a 100644
--- a/generators/input/environments/wheezy-x64-xen-1.3.rb
+++ b/generators/input/environments/wheezy-x64-xen-1.3.rb
@@ -2,8 +2,8 @@ environment 'wheezy-x64-xen-1.3' do
   state "stable"
   file({:path => "/grid5000/images/wheezy-x64-xen-1.3.tgz", :md5 => "fbd01f78fe52e06d8451017d9095ce89"})
   kernel "3.2.0-4"
-  available_on %w{grenoble lille luxembourg lyon nancy reims rennes sophia toulouse}
-  valid_on "adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paramount , parapide , parapluie , sol , suno, pastel"
+  available_on %w{grenoble lille luxembourg lyon nancy nantes reims rennes sophia toulouse}
+  valid_on "adonis , edel , genepi , chimint , chinqchint , chirloute , granduc , petitprince , hercule, orion, sagittaire, taurus, graphene , griffon , stremi , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel"
   based_on "Debian version wheezy for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
-- 
GitLab