From a995db9611329914828466b3360d8b7c99d71916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr>
Date: Tue, 26 Apr 2016 17:50:23 +0200
Subject: [PATCH] [dev] Removed old generators

---
 Gemfile                                       |   16 -
 Gemfile.lock                                  |   91 -
 Rakefile                                      |  287 ---
 generators/grid5000                           |   91 -
 generators/input/net-links.rb                 |   34 -
 .../sites/grenoble/clusters/adonis/adonis.rb  |  172 --
 .../clusters/adonis/adonis_manual.yaml        |  141 --
 .../clusters/adonis/nodes/adonis-1.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-10.yaml      |   75 -
 .../clusters/adonis/nodes/adonis-2.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-3.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-4.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-5.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-6.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-7.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-8.yaml       |   75 -
 .../clusters/adonis/nodes/adonis-9.yaml       |   75 -
 .../sites/grenoble/clusters/edel/edel.rb      |  175 --
 .../grenoble/clusters/edel/edel_manual.yaml   |  361 ----
 .../grenoble/clusters/edel/nodes/edel-1.yaml  |   84 -
 .../grenoble/clusters/edel/nodes/edel-10.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-11.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-12.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-13.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-14.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-15.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-16.yaml |   88 -
 .../grenoble/clusters/edel/nodes/edel-17.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-18.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-19.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-2.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-20.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-21.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-22.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-23.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-24.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-25.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-26.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-27.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-28.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-29.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-3.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-30.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-31.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-32.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-33.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-34.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-35.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-36.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-37.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-38.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-39.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-4.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-40.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-41.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-42.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-43.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-44.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-45.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-46.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-47.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-48.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-49.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-5.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-50.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-51.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-52.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-53.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-54.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-55.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-56.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-57.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-58.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-59.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-6.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-60.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-61.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-62.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-63.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-64.yaml |   84 -
 .../grenoble/clusters/edel/nodes/edel-65.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-66.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-67.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-68.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-69.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-7.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-70.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-71.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-72.yaml |   80 -
 .../grenoble/clusters/edel/nodes/edel-8.yaml  |   80 -
 .../grenoble/clusters/edel/nodes/edel-9.yaml  |   80 -
 .../sites/grenoble/clusters/genepi/genepi.rb  |  165 --
 .../clusters/genepi/genepi_manual.yaml        |  170 --
 .../clusters/genepi/nodes/genepi-1.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-10.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-11.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-12.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-13.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-14.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-15.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-16.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-17.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-18.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-19.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-2.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-20.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-21.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-22.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-23.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-24.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-25.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-26.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-27.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-28.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-29.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-3.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-30.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-31.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-32.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-33.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-34.yaml      |   86 -
 .../clusters/genepi/nodes/genepi-4.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-5.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-6.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-7.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-8.yaml       |   86 -
 .../clusters/genepi/nodes/genepi-9.yaml       |   86 -
 generators/input/sites/grenoble/grenoble.rb   |   70 -
 .../sites/grenoble/net-links/gw-grenoble.yaml |  337 ---
 .../sites/grenoble/net-links/ib-grenoble.yaml |   23 -
 .../sites/grenoble/net-links/sw-edel-1.yaml   |   55 -
 .../sites/grenoble/net-links/sw-edel-2.yaml   |   55 -
 .../sites/grenoble/net-links/sw-edel-3.yaml   |   55 -
 .../sites/grenoble/net-links/sw-edel-4.yaml   |   55 -
 .../sites/grenoble/net-links/voltaire-1.yaml  |   21 -
 .../sites/grenoble/net-links/voltaire-2.yaml  |   21 -
 .../sites/grenoble/net-links/voltaire-3.yaml  |   21 -
 generators/input/sites/grenoble/pdus.rb       |   23 -
 .../sites/lille/clusters/chimint/chimint.rb   |  134 --
 .../clusters/chimint/chimint_manual.yaml      |   81 -
 .../clusters/chimint/nodes/chimint-1.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-10.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-11.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-12.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-13.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-14.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-15.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-16.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-17.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-18.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-19.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-2.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-20.yaml    |   65 -
 .../clusters/chimint/nodes/chimint-3.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-4.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-5.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-6.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-7.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-8.yaml     |   65 -
 .../clusters/chimint/nodes/chimint-9.yaml     |   65 -
 .../lille/clusters/chinqchint/chinqchint.rb   |  154 --
 .../chinqchint/chinqchint_manual.yaml         |  185 --
 .../chinqchint/nodes/chinqchint-1.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-10.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-11.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-12.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-13.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-14.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-15.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-16.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-17.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-18.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-19.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-2.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-20.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-21.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-22.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-23.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-24.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-25.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-26.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-27.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-28.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-29.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-3.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-30.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-31.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-32.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-33.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-34.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-35.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-36.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-37.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-38.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-39.yaml       |   79 -
 .../chinqchint/nodes/chinqchint-4.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-40.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-41.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-42.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-43.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-44.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-45.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-46.yaml       |   75 -
 .../chinqchint/nodes/chinqchint-5.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-6.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-7.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-8.yaml        |   75 -
 .../chinqchint/nodes/chinqchint-9.yaml        |   75 -
 .../lille/clusters/chirloute/chirloute.rb     |  151 --
 .../clusters/chirloute/chirloute_manual.yaml  |   65 -
 .../clusters/chirloute/nodes/chirloute-1.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-2.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-3.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-4.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-5.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-6.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-7.yaml |   65 -
 .../clusters/chirloute/nodes/chirloute-8.yaml |   65 -
 generators/input/sites/lille/lille.rb         |   70 -
 .../input/sites/lille/net-links/gw-lille.yaml |  263 ---
 .../input/sites/lille/net-links/myrinet.yaml  |   24 -
 generators/input/sites/lille/pdus.rb          |    0
 .../luxembourg/clusters/granduc/granduc.rb    |  167 --
 .../clusters/granduc/granduc_manual.yaml      |  219 --
 .../clusters/granduc/nodes/granduc-1.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-10.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-11.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-12.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-13.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-14.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-15.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-16.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-17.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-18.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-19.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-2.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-20.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-21.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-22.yaml    |   83 -
 .../clusters/granduc/nodes/granduc-3.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-4.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-5.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-6.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-7.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-8.yaml     |   83 -
 .../clusters/granduc/nodes/granduc-9.yaml     |   83 -
 .../petitprince/nodes/petitprince-1.yaml      |   59 -
 .../petitprince/nodes/petitprince-10.yaml     |   59 -
 .../petitprince/nodes/petitprince-11.yaml     |   59 -
 .../petitprince/nodes/petitprince-12.yaml     |   59 -
 .../petitprince/nodes/petitprince-13.yaml     |   59 -
 .../petitprince/nodes/petitprince-14.yaml     |   59 -
 .../petitprince/nodes/petitprince-15.yaml     |   59 -
 .../petitprince/nodes/petitprince-16.yaml     |   59 -
 .../petitprince/nodes/petitprince-2.yaml      |   59 -
 .../petitprince/nodes/petitprince-3.yaml      |   59 -
 .../petitprince/nodes/petitprince-4.yaml      |   59 -
 .../petitprince/nodes/petitprince-5.yaml      |   59 -
 .../petitprince/nodes/petitprince-6.yaml      |   59 -
 .../petitprince/nodes/petitprince-7.yaml      |   59 -
 .../petitprince/nodes/petitprince-8.yaml      |   59 -
 .../petitprince/nodes/petitprince-9.yaml      |   59 -
 .../clusters/petitprince/petitprince.rb       |  138 --
 .../petitprince/petitprince_manual.yaml       |  193 --
 .../input/sites/luxembourg/luxembourg.rb      |   70 -
 .../luxembourg/net-links/gw-luxembourg.yaml   |  387 ----
 .../sites/luxembourg/net-links/mxl1.yaml      |  101 -
 .../sites/luxembourg/net-links/mxl2.yaml      |  101 -
 .../net-links/ul-grid5000-sw02.yaml           |  168 --
 generators/input/sites/luxembourg/pdus.rb     |    0
 .../sites/lyon/clusters/hercule/hercule.rb    |  189 --
 .../lyon/clusters/hercule/hercule_manual.yaml |    0
 .../clusters/hercule/nodes/hercule-1.yaml     |   89 -
 .../clusters/hercule/nodes/hercule-2.yaml     |   89 -
 .../clusters/hercule/nodes/hercule-3.yaml     |   89 -
 .../clusters/hercule/nodes/hercule-4.yaml     |   89 -
 .../lyon/clusters/orion/nodes/orion-1.yaml    |   95 -
 .../lyon/clusters/orion/nodes/orion-2.yaml    |   95 -
 .../lyon/clusters/orion/nodes/orion-3.yaml    |   95 -
 .../lyon/clusters/orion/nodes/orion-4.yaml    |   95 -
 .../input/sites/lyon/clusters/orion/orion.rb  |  207 --
 .../lyon/clusters/orion/orion_manual.yaml     |   17 -
 .../sagittaire/nodes/sagittaire-1.yaml        |   64 -
 .../sagittaire/nodes/sagittaire-10.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-11.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-12.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-13.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-14.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-15.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-16.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-17.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-18.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-19.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-2.yaml        |   64 -
 .../sagittaire/nodes/sagittaire-20.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-21.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-22.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-23.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-24.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-25.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-26.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-27.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-28.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-29.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-3.yaml        |   64 -
 .../sagittaire/nodes/sagittaire-30.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-31.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-32.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-33.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-34.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-35.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-36.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-37.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-38.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-39.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-4.yaml        |   69 -
 .../sagittaire/nodes/sagittaire-40.yaml       |   68 -
 .../sagittaire/nodes/sagittaire-41.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-42.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-43.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-44.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-45.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-46.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-47.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-48.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-49.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-5.yaml        |   64 -
 .../sagittaire/nodes/sagittaire-50.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-51.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-52.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-53.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-54.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-55.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-56.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-57.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-58.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-59.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-6.yaml        |   64 -
 .../sagittaire/nodes/sagittaire-60.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-61.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-62.yaml       |   68 -
 .../sagittaire/nodes/sagittaire-63.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-64.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-65.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-66.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-67.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-68.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-69.yaml       |   64 -
 .../sagittaire/nodes/sagittaire-7.yaml        |   64 -
 .../sagittaire/nodes/sagittaire-70.yaml       |   68 -
 .../sagittaire/nodes/sagittaire-71.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-72.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-73.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-74.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-75.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-76.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-77.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-78.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-79.yaml       |   69 -
 .../sagittaire/nodes/sagittaire-8.yaml        |   69 -
 .../sagittaire/nodes/sagittaire-9.yaml        |   64 -
 .../lyon/clusters/sagittaire/sagittaire.rb    |  168 --
 .../sagittaire/sagittaire_manual.yaml         |  317 ---
 .../lyon/clusters/taurus/nodes/taurus-1.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-10.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-11.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-12.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-13.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-14.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-15.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-16.yaml |   95 -
 .../lyon/clusters/taurus/nodes/taurus-2.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-3.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-4.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-5.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-6.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-7.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-8.yaml  |   95 -
 .../lyon/clusters/taurus/nodes/taurus-9.yaml  |   95 -
 .../sites/lyon/clusters/taurus/taurus.rb      |  204 --
 .../lyon/clusters/taurus/taurus_manual.yaml   |   65 -
 generators/input/sites/lyon/lyon.rb           |   70 -
 .../input/sites/lyon/net-links/force10.yaml   |   71 -
 .../input/sites/lyon/net-links/gw-lyon.yaml   |  200 --
 .../input/sites/lyon/net-links/pat.yaml       |   59 -
 .../input/sites/lyon/net-links/salome.yaml    |   33 -
 generators/input/sites/lyon/pdus.rb           |   18 -
 .../sites/nancy/clusters/graoully/graoully.rb |  233 --
 .../clusters/graoully/graoully_manual.yaml    |   65 -
 .../clusters/graoully/nodes/graoully-1.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-10.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-11.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-12.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-13.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-14.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-15.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-16.yaml  |   92 -
 .../clusters/graoully/nodes/graoully-2.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-3.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-4.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-5.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-6.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-7.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-8.yaml   |   92 -
 .../clusters/graoully/nodes/graoully-9.yaml   |   92 -
 .../sites/nancy/clusters/graphene/graphene.rb |  205 --
 .../clusters/graphene/graphene_manual.yaml    | 1873 -----------------
 .../clusters/graphene/nodes/graphene-1.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-10.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-100.yaml |   94 -
 .../clusters/graphene/nodes/graphene-101.yaml |   94 -
 .../clusters/graphene/nodes/graphene-102.yaml |   94 -
 .../clusters/graphene/nodes/graphene-103.yaml |   94 -
 .../clusters/graphene/nodes/graphene-104.yaml |   94 -
 .../clusters/graphene/nodes/graphene-105.yaml |   94 -
 .../clusters/graphene/nodes/graphene-106.yaml |   94 -
 .../clusters/graphene/nodes/graphene-107.yaml |   94 -
 .../clusters/graphene/nodes/graphene-108.yaml |   94 -
 .../clusters/graphene/nodes/graphene-109.yaml |   94 -
 .../clusters/graphene/nodes/graphene-11.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-110.yaml |   94 -
 .../clusters/graphene/nodes/graphene-111.yaml |   94 -
 .../clusters/graphene/nodes/graphene-112.yaml |   94 -
 .../clusters/graphene/nodes/graphene-113.yaml |   94 -
 .../clusters/graphene/nodes/graphene-114.yaml |   94 -
 .../clusters/graphene/nodes/graphene-115.yaml |   94 -
 .../clusters/graphene/nodes/graphene-116.yaml |   94 -
 .../clusters/graphene/nodes/graphene-117.yaml |   94 -
 .../clusters/graphene/nodes/graphene-118.yaml |   94 -
 .../clusters/graphene/nodes/graphene-119.yaml |   94 -
 .../clusters/graphene/nodes/graphene-12.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-120.yaml |   94 -
 .../clusters/graphene/nodes/graphene-121.yaml |   94 -
 .../clusters/graphene/nodes/graphene-122.yaml |   94 -
 .../clusters/graphene/nodes/graphene-123.yaml |   94 -
 .../clusters/graphene/nodes/graphene-124.yaml |   94 -
 .../clusters/graphene/nodes/graphene-125.yaml |   94 -
 .../clusters/graphene/nodes/graphene-126.yaml |   94 -
 .../clusters/graphene/nodes/graphene-127.yaml |   94 -
 .../clusters/graphene/nodes/graphene-128.yaml |   94 -
 .../clusters/graphene/nodes/graphene-129.yaml |   94 -
 .../clusters/graphene/nodes/graphene-13.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-130.yaml |   94 -
 .../clusters/graphene/nodes/graphene-131.yaml |   94 -
 .../clusters/graphene/nodes/graphene-132.yaml |   94 -
 .../clusters/graphene/nodes/graphene-133.yaml |   94 -
 .../clusters/graphene/nodes/graphene-134.yaml |   94 -
 .../clusters/graphene/nodes/graphene-135.yaml |   94 -
 .../clusters/graphene/nodes/graphene-136.yaml |   94 -
 .../clusters/graphene/nodes/graphene-137.yaml |   94 -
 .../clusters/graphene/nodes/graphene-138.yaml |   94 -
 .../clusters/graphene/nodes/graphene-139.yaml |   94 -
 .../clusters/graphene/nodes/graphene-14.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-140.yaml |   94 -
 .../clusters/graphene/nodes/graphene-141.yaml |   94 -
 .../clusters/graphene/nodes/graphene-142.yaml |   94 -
 .../clusters/graphene/nodes/graphene-143.yaml |   94 -
 .../clusters/graphene/nodes/graphene-144.yaml |   94 -
 .../clusters/graphene/nodes/graphene-15.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-16.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-17.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-18.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-19.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-2.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-20.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-21.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-22.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-23.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-24.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-25.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-26.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-27.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-28.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-29.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-3.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-30.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-31.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-32.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-33.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-34.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-35.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-36.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-37.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-38.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-39.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-4.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-40.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-41.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-42.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-43.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-44.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-45.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-46.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-47.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-48.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-49.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-5.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-50.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-51.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-52.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-53.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-54.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-55.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-56.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-57.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-58.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-59.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-6.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-60.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-61.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-62.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-63.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-64.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-65.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-66.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-67.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-68.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-69.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-7.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-70.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-71.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-72.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-73.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-74.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-75.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-76.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-77.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-78.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-79.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-8.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-80.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-81.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-82.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-83.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-84.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-85.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-86.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-87.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-88.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-89.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-9.yaml   |   94 -
 .../clusters/graphene/nodes/graphene-90.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-91.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-92.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-93.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-94.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-95.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-96.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-97.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-98.yaml  |   94 -
 .../clusters/graphene/nodes/graphene-99.yaml  |   94 -
 .../nancy/clusters/graphique/graphique.rb     |  175 --
 .../clusters/graphique/nodes/graphique-1.yaml |   75 -
 .../clusters/graphique/nodes/graphique-2.yaml |   75 -
 .../clusters/graphique/nodes/graphique-3.yaml |   75 -
 .../clusters/graphique/nodes/graphique-4.yaml |   76 -
 .../clusters/graphique/nodes/graphique-5.yaml |   76 -
 .../clusters/graphique/nodes/graphique-6.yaml |   77 -
 .../sites/nancy/clusters/graphite/graphite.rb |  224 --
 .../clusters/graphite/graphite_manual.yaml    |   57 -
 .../clusters/graphite/nodes/graphite-1.yaml   |   92 -
 .../clusters/graphite/nodes/graphite-2.yaml   |   92 -
 .../clusters/graphite/nodes/graphite-3.yaml   |   94 -
 .../clusters/graphite/nodes/graphite-4.yaml   |   94 -
 .../sites/nancy/clusters/griffon/griffon.rb   |  278 ---
 .../clusters/griffon/griffon_manual.yaml      | 1391 ------------
 .../clusters/griffon/nodes/griffon-1.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-10.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-11.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-12.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-13.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-14.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-15.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-16.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-17.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-18.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-19.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-2.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-20.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-21.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-22.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-23.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-24.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-25.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-26.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-27.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-28.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-29.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-3.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-30.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-31.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-32.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-33.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-34.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-35.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-36.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-37.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-38.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-39.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-4.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-40.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-41.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-42.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-43.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-44.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-45.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-46.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-47.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-48.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-49.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-5.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-50.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-51.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-52.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-53.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-54.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-55.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-56.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-57.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-58.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-59.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-6.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-60.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-61.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-62.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-63.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-64.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-65.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-66.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-67.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-68.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-69.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-7.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-70.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-71.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-72.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-73.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-74.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-75.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-76.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-77.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-78.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-79.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-8.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-80.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-81.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-82.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-83.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-84.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-85.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-86.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-87.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-88.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-89.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-9.yaml     |   85 -
 .../clusters/griffon/nodes/griffon-90.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-91.yaml    |   85 -
 .../clusters/griffon/nodes/griffon-92.yaml    |   85 -
 .../sites/nancy/clusters/grimoire/grimoire.rb |  279 ---
 .../clusters/grimoire/grimoire_manual.yaml    |   33 -
 .../clusters/grimoire/nodes/grimoire-1.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-2.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-3.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-4.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-5.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-6.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-7.yaml   |  113 -
 .../clusters/grimoire/nodes/grimoire-8.yaml   |  113 -
 .../sites/nancy/clusters/grisou/grisou.rb     |  445 ----
 .../nancy/clusters/grisou/grisou_manual.yaml  |  205 --
 .../nancy/clusters/grisou/nodes/grisou-1.yaml |   85 -
 .../clusters/grisou/nodes/grisou-10.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-11.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-12.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-13.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-14.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-15.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-16.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-17.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-18.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-19.yaml      |   85 -
 .../nancy/clusters/grisou/nodes/grisou-2.yaml |   85 -
 .../clusters/grisou/nodes/grisou-20.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-21.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-22.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-23.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-24.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-25.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-26.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-27.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-28.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-29.yaml      |   85 -
 .../nancy/clusters/grisou/nodes/grisou-3.yaml |   85 -
 .../clusters/grisou/nodes/grisou-30.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-31.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-32.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-33.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-34.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-35.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-36.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-37.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-38.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-39.yaml      |   85 -
 .../nancy/clusters/grisou/nodes/grisou-4.yaml |   85 -
 .../clusters/grisou/nodes/grisou-40.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-41.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-42.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-43.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-44.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-45.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-46.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-47.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-48.yaml      |   85 -
 .../clusters/grisou/nodes/grisou-49.yaml      |   85 -
 .../nancy/clusters/grisou/nodes/grisou-5.yaml |   85 -
 .../clusters/grisou/nodes/grisou-50.yaml      |   94 -
 .../clusters/grisou/nodes/grisou-51.yaml      |   94 -
 .../nancy/clusters/grisou/nodes/grisou-6.yaml |   85 -
 .../nancy/clusters/grisou/nodes/grisou-7.yaml |   85 -
 .../nancy/clusters/grisou/nodes/grisou-8.yaml |   85 -
 .../nancy/clusters/grisou/nodes/grisou-9.yaml |   85 -
 .../nancy/clusters/talc/nodes/talc-1.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-10.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-100.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-101.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-102.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-103.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-104.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-105.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-106.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-107.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-108.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-109.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-11.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-110.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-111.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-112.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-113.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-114.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-115.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-116.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-117.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-118.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-119.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-12.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-120.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-121.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-122.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-123.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-124.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-125.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-126.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-127.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-128.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-129.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-13.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-130.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-131.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-132.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-133.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-134.yaml   |   57 -
 .../nancy/clusters/talc/nodes/talc-14.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-15.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-16.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-17.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-18.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-19.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-2.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-20.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-21.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-22.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-23.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-24.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-25.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-26.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-27.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-28.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-29.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-3.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-30.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-31.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-32.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-33.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-34.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-35.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-36.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-37.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-38.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-39.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-4.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-40.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-41.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-42.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-43.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-44.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-45.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-46.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-47.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-48.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-49.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-5.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-50.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-51.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-52.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-53.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-54.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-55.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-56.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-57.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-58.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-59.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-6.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-60.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-61.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-62.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-63.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-64.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-65.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-66.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-67.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-68.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-69.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-7.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-70.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-71.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-72.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-73.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-74.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-75.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-76.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-77.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-78.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-79.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-8.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-80.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-81.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-82.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-83.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-84.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-85.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-86.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-87.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-88.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-89.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-9.yaml     |   57 -
 .../nancy/clusters/talc/nodes/talc-90.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-91.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-92.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-93.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-94.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-95.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-96.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-97.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-98.yaml    |   57 -
 .../nancy/clusters/talc/nodes/talc-99.yaml    |   57 -
 .../input/sites/nancy/clusters/talc/talc.rb   |  133 --
 generators/input/sites/nancy/nancy.rb         |   70 -
 .../input/sites/nancy/net-links/gw-nancy.yaml |  933 --------
 .../sites/nancy/net-links/sgraoullyib.yaml    |   24 -
 .../sites/nancy/net-links/sgraphene1.yaml     |   72 -
 .../sites/nancy/net-links/sgraphene2.yaml     |   68 -
 .../sites/nancy/net-links/sgraphene3.yaml     |   63 -
 .../sites/nancy/net-links/sgraphene4.yaml     |   73 -
 .../sites/nancy/net-links/sgrapheneib.yaml    |   24 -
 .../sites/nancy/net-links/sgravillon1.yaml    |  196 --
 .../sites/nancy/net-links/sgriffon1.yaml      |   78 -
 .../input/sites/nancy/net-links/stalc1.yaml   |  178 --
 .../input/sites/nancy/net-links/stalc2.yaml   |  136 --
 .../input/sites/nancy/net-links/stalc3.yaml   |  146 --
 .../input/sites/nancy/net-links/stalc4.yaml   |  115 -
 generators/input/sites/nancy/pdus.rb          |  114 -
 .../sites/nantes/clusters/econome/econome.rb  |  169 --
 .../clusters/econome/econome_manual.yaml      |   91 -
 .../clusters/econome/nodes/econome-1.yaml     |   73 -
 .../clusters/econome/nodes/econome-10.yaml    |   73 -
 .../clusters/econome/nodes/econome-11.yaml    |   73 -
 .../clusters/econome/nodes/econome-12.yaml    |   73 -
 .../clusters/econome/nodes/econome-13.yaml    |   73 -
 .../clusters/econome/nodes/econome-14.yaml    |   73 -
 .../clusters/econome/nodes/econome-15.yaml    |   65 -
 .../clusters/econome/nodes/econome-16.yaml    |   73 -
 .../clusters/econome/nodes/econome-17.yaml    |   73 -
 .../clusters/econome/nodes/econome-18.yaml    |   73 -
 .../clusters/econome/nodes/econome-19.yaml    |   62 -
 .../clusters/econome/nodes/econome-2.yaml     |   73 -
 .../clusters/econome/nodes/econome-20.yaml    |   63 -
 .../clusters/econome/nodes/econome-21.yaml    |   62 -
 .../clusters/econome/nodes/econome-22.yaml    |   62 -
 .../clusters/econome/nodes/econome-3.yaml     |   73 -
 .../clusters/econome/nodes/econome-4.yaml     |   73 -
 .../clusters/econome/nodes/econome-5.yaml     |   73 -
 .../clusters/econome/nodes/econome-6.yaml     |   73 -
 .../clusters/econome/nodes/econome-7.yaml     |   73 -
 .../clusters/econome/nodes/econome-8.yaml     |   73 -
 .../clusters/econome/nodes/econome-9.yaml     |   73 -
 generators/input/sites/nantes/nantes.rb       |   70 -
 .../sites/nantes/net-links/gw-nantes.yaml     |   99 -
 generators/input/sites/nantes/pdus.rb         |    0
 .../reims/clusters/stremi/nodes/stremi-1.yaml |   78 -
 .../clusters/stremi/nodes/stremi-10.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-11.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-12.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-13.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-14.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-15.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-16.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-17.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-18.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-19.yaml      |   78 -
 .../reims/clusters/stremi/nodes/stremi-2.yaml |   78 -
 .../clusters/stremi/nodes/stremi-20.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-21.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-22.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-23.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-24.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-25.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-26.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-27.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-28.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-29.yaml      |   78 -
 .../reims/clusters/stremi/nodes/stremi-3.yaml |   78 -
 .../clusters/stremi/nodes/stremi-30.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-31.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-32.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-33.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-34.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-35.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-36.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-37.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-38.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-39.yaml      |   78 -
 .../reims/clusters/stremi/nodes/stremi-4.yaml |   78 -
 .../clusters/stremi/nodes/stremi-40.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-41.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-42.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-43.yaml      |   78 -
 .../clusters/stremi/nodes/stremi-44.yaml      |   78 -
 .../reims/clusters/stremi/nodes/stremi-5.yaml |   78 -
 .../reims/clusters/stremi/nodes/stremi-6.yaml |   78 -
 .../reims/clusters/stremi/nodes/stremi-7.yaml |   78 -
 .../reims/clusters/stremi/nodes/stremi-8.yaml |   78 -
 .../reims/clusters/stremi/nodes/stremi-9.yaml |   78 -
 .../sites/reims/clusters/stremi/stremi.rb     |  166 --
 .../reims/clusters/stremi/stremi_manual.yaml  |  353 ----
 .../input/sites/reims/net-links/gw-reims.yaml |  121 --
 generators/input/sites/reims/pdus.rb          |   21 -
 generators/input/sites/reims/reims.rb         |   70 -
 .../clusters/paranoia/nodes/paranoia-1.yaml   |   94 -
 .../clusters/paranoia/nodes/paranoia-2.yaml   |   93 -
 .../clusters/paranoia/nodes/paranoia-3.yaml   |   94 -
 .../clusters/paranoia/nodes/paranoia-4.yaml   |   93 -
 .../clusters/paranoia/nodes/paranoia-5.yaml   |   93 -
 .../clusters/paranoia/nodes/paranoia-6.yaml   |   93 -
 .../clusters/paranoia/nodes/paranoia-7.yaml   |   93 -
 .../clusters/paranoia/nodes/paranoia-8.yaml   |   93 -
 .../rennes/clusters/paranoia/paranoia.rb      |  213 --
 .../clusters/paranoia/paranoia_manual.yaml    |   65 -
 .../clusters/parapide/nodes/parapide-1.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-10.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-11.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-12.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-13.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-14.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-15.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-16.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-17.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-18.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-19.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-2.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-20.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-21.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-22.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-23.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-24.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-25.yaml  |   90 -
 .../clusters/parapide/nodes/parapide-3.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-4.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-5.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-6.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-7.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-8.yaml   |   90 -
 .../clusters/parapide/nodes/parapide-9.yaml   |   90 -
 .../rennes/clusters/parapide/parapide.rb      |  189 --
 .../clusters/parapide/parapide_manual.yaml    |  176 --
 .../clusters/parapluie/nodes/parapluie-1.yaml |  102 -
 .../parapluie/nodes/parapluie-10.yaml         |  102 -
 .../parapluie/nodes/parapluie-11.yaml         |  102 -
 .../parapluie/nodes/parapluie-12.yaml         |  102 -
 .../parapluie/nodes/parapluie-13.yaml         |  102 -
 .../parapluie/nodes/parapluie-14.yaml         |  102 -
 .../parapluie/nodes/parapluie-15.yaml         |  102 -
 .../parapluie/nodes/parapluie-16.yaml         |  102 -
 .../parapluie/nodes/parapluie-17.yaml         |  102 -
 .../parapluie/nodes/parapluie-18.yaml         |  102 -
 .../parapluie/nodes/parapluie-19.yaml         |  102 -
 .../clusters/parapluie/nodes/parapluie-2.yaml |  102 -
 .../parapluie/nodes/parapluie-20.yaml         |  102 -
 .../parapluie/nodes/parapluie-21.yaml         |  102 -
 .../parapluie/nodes/parapluie-22.yaml         |  102 -
 .../parapluie/nodes/parapluie-23.yaml         |  102 -
 .../parapluie/nodes/parapluie-24.yaml         |  102 -
 .../parapluie/nodes/parapluie-25.yaml         |  102 -
 .../parapluie/nodes/parapluie-26.yaml         |  102 -
 .../parapluie/nodes/parapluie-27.yaml         |  102 -
 .../parapluie/nodes/parapluie-28.yaml         |  102 -
 .../parapluie/nodes/parapluie-29.yaml         |  102 -
 .../clusters/parapluie/nodes/parapluie-3.yaml |  102 -
 .../parapluie/nodes/parapluie-30.yaml         |  102 -
 .../parapluie/nodes/parapluie-31.yaml         |  102 -
 .../parapluie/nodes/parapluie-32.yaml         |  102 -
 .../parapluie/nodes/parapluie-33.yaml         |  102 -
 .../parapluie/nodes/parapluie-34.yaml         |  102 -
 .../parapluie/nodes/parapluie-35.yaml         |  102 -
 .../parapluie/nodes/parapluie-36.yaml         |  102 -
 .../parapluie/nodes/parapluie-37.yaml         |  102 -
 .../parapluie/nodes/parapluie-38.yaml         |  102 -
 .../parapluie/nodes/parapluie-39.yaml         |  102 -
 .../clusters/parapluie/nodes/parapluie-4.yaml |  102 -
 .../parapluie/nodes/parapluie-40.yaml         |  102 -
 .../clusters/parapluie/nodes/parapluie-5.yaml |  102 -
 .../clusters/parapluie/nodes/parapluie-6.yaml |  102 -
 .../clusters/parapluie/nodes/parapluie-7.yaml |  102 -
 .../clusters/parapluie/nodes/parapluie-8.yaml |  102 -
 .../clusters/parapluie/nodes/parapluie-9.yaml |  102 -
 .../rennes/clusters/parapluie/parapluie.rb    |  222 --
 .../clusters/parapluie/parapluie_manual.yaml  |  321 ---
 .../clusters/parasilo/nodes/parasilo-1.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-10.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-11.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-12.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-13.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-14.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-15.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-16.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-17.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-18.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-19.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-2.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-20.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-21.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-22.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-23.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-24.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-25.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-26.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-27.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-28.yaml  |   88 -
 .../clusters/parasilo/nodes/parasilo-3.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-4.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-5.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-6.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-7.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-8.yaml   |   88 -
 .../clusters/parasilo/nodes/parasilo-9.yaml   |   88 -
 .../rennes/clusters/parasilo/parasilo.rb      |  226 --
 .../clusters/parasilo/parasilo_manual.yaml    |  113 -
 .../clusters/paravance/nodes/paravance-1.yaml |   71 -
 .../paravance/nodes/paravance-10.yaml         |   68 -
 .../paravance/nodes/paravance-11.yaml         |   68 -
 .../paravance/nodes/paravance-12.yaml         |   68 -
 .../paravance/nodes/paravance-13.yaml         |   68 -
 .../paravance/nodes/paravance-14.yaml         |   68 -
 .../paravance/nodes/paravance-15.yaml         |   68 -
 .../paravance/nodes/paravance-16.yaml         |   68 -
 .../paravance/nodes/paravance-17.yaml         |   68 -
 .../paravance/nodes/paravance-18.yaml         |   68 -
 .../paravance/nodes/paravance-19.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-2.yaml |   68 -
 .../paravance/nodes/paravance-20.yaml         |   68 -
 .../paravance/nodes/paravance-21.yaml         |   68 -
 .../paravance/nodes/paravance-22.yaml         |   68 -
 .../paravance/nodes/paravance-23.yaml         |   68 -
 .../paravance/nodes/paravance-24.yaml         |   68 -
 .../paravance/nodes/paravance-25.yaml         |   68 -
 .../paravance/nodes/paravance-26.yaml         |   68 -
 .../paravance/nodes/paravance-27.yaml         |   68 -
 .../paravance/nodes/paravance-28.yaml         |   68 -
 .../paravance/nodes/paravance-29.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-3.yaml |   68 -
 .../paravance/nodes/paravance-30.yaml         |   68 -
 .../paravance/nodes/paravance-31.yaml         |   68 -
 .../paravance/nodes/paravance-32.yaml         |   68 -
 .../paravance/nodes/paravance-33.yaml         |   68 -
 .../paravance/nodes/paravance-34.yaml         |   68 -
 .../paravance/nodes/paravance-35.yaml         |   68 -
 .../paravance/nodes/paravance-36.yaml         |   68 -
 .../paravance/nodes/paravance-37.yaml         |   68 -
 .../paravance/nodes/paravance-38.yaml         |   68 -
 .../paravance/nodes/paravance-39.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-4.yaml |   68 -
 .../paravance/nodes/paravance-40.yaml         |   68 -
 .../paravance/nodes/paravance-41.yaml         |   68 -
 .../paravance/nodes/paravance-42.yaml         |   68 -
 .../paravance/nodes/paravance-43.yaml         |   68 -
 .../paravance/nodes/paravance-44.yaml         |   68 -
 .../paravance/nodes/paravance-45.yaml         |   68 -
 .../paravance/nodes/paravance-46.yaml         |   68 -
 .../paravance/nodes/paravance-47.yaml         |   68 -
 .../paravance/nodes/paravance-48.yaml         |   68 -
 .../paravance/nodes/paravance-49.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-5.yaml |   68 -
 .../paravance/nodes/paravance-50.yaml         |   68 -
 .../paravance/nodes/paravance-51.yaml         |   68 -
 .../paravance/nodes/paravance-52.yaml         |   68 -
 .../paravance/nodes/paravance-53.yaml         |   68 -
 .../paravance/nodes/paravance-54.yaml         |   68 -
 .../paravance/nodes/paravance-55.yaml         |   68 -
 .../paravance/nodes/paravance-56.yaml         |   68 -
 .../paravance/nodes/paravance-57.yaml         |   68 -
 .../paravance/nodes/paravance-58.yaml         |   68 -
 .../paravance/nodes/paravance-59.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-6.yaml |   68 -
 .../paravance/nodes/paravance-60.yaml         |   68 -
 .../paravance/nodes/paravance-61.yaml         |   68 -
 .../paravance/nodes/paravance-62.yaml         |   68 -
 .../paravance/nodes/paravance-63.yaml         |   68 -
 .../paravance/nodes/paravance-64.yaml         |   68 -
 .../paravance/nodes/paravance-65.yaml         |   68 -
 .../paravance/nodes/paravance-66.yaml         |   68 -
 .../paravance/nodes/paravance-67.yaml         |   68 -
 .../paravance/nodes/paravance-68.yaml         |   68 -
 .../paravance/nodes/paravance-69.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-7.yaml |   68 -
 .../paravance/nodes/paravance-70.yaml         |   68 -
 .../paravance/nodes/paravance-71.yaml         |   68 -
 .../paravance/nodes/paravance-72.yaml         |   68 -
 .../clusters/paravance/nodes/paravance-8.yaml |   68 -
 .../clusters/paravance/nodes/paravance-9.yaml |   68 -
 .../rennes/clusters/paravance/paravance.rb    |  189 --
 .../clusters/paravance/paravance_manual.yaml  |  289 ---
 .../sites/rennes/net-links/bigdata-sw.yaml    |   52 -
 .../input/sites/rennes/net-links/c6509.yaml   |  163 --
 .../sites/rennes/net-links/gw-rennes.yaml     |  337 ---
 .../rennes/net-links/paravance-sw-1.yaml      |  326 ---
 .../rennes/net-links/paravance-sw-2.yaml      |  326 ---
 generators/input/sites/rennes/pdus.rb         |   82 -
 generators/input/sites/rennes/rennes.rb       |   70 -
 .../sophia/clusters/sol/nodes/sol-1.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-10.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-11.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-12.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-13.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-14.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-15.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-16.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-17.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-18.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-19.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-2.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-20.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-21.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-22.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-23.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-24.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-25.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-26.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-27.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-28.yaml     |   63 -
 .../sophia/clusters/sol/nodes/sol-29.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-3.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-30.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-31.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-32.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-33.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-34.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-35.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-36.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-37.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-38.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-39.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-4.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-40.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-41.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-42.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-43.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-44.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-45.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-46.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-47.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-48.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-49.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-5.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-50.yaml     |   74 -
 .../sophia/clusters/sol/nodes/sol-6.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-7.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-8.yaml      |   63 -
 .../sophia/clusters/sol/nodes/sol-9.yaml      |   63 -
 .../input/sites/sophia/clusters/sol/sol.rb    |  277 ---
 .../sites/sophia/clusters/sol/sol_manual.yaml |  251 ---
 .../sophia/clusters/suno/nodes/suno-1.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-10.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-11.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-12.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-13.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-14.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-15.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-16.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-17.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-18.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-19.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-2.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-20.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-21.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-22.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-23.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-24.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-25.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-26.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-27.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-28.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-29.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-3.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-30.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-31.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-32.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-33.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-34.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-35.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-36.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-37.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-38.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-39.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-4.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-40.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-41.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-42.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-43.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-44.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-45.yaml   |   63 -
 .../sophia/clusters/suno/nodes/suno-5.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-6.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-7.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-8.yaml    |   63 -
 .../sophia/clusters/suno/nodes/suno-9.yaml    |   63 -
 .../input/sites/sophia/clusters/suno/suno.rb  |  139 --
 .../sophia/clusters/suno/suno_manual.yaml     |  226 --
 .../sites/sophia/net-links/edgeiron.yaml      |  102 -
 .../sites/sophia/net-links/gw-sophia.yaml     |  289 ---
 generators/input/sites/sophia/pdus.rb         |    0
 generators/input/sites/sophia/sophia.rb       |   70 -
 generators/lib/core_extensions.rb             |   97 -
 generators/lib/g5k_generator.rb               |  488 -----
 generators/lib/grid5000.rb                    |    7 -
 generators/lib/grid5000/cluster.rb            |   11 -
 generators/lib/grid5000/node.rb               |   92 -
 generators/lib/grid5000/pdu.rb                |   11 -
 1246 files changed, 108313 deletions(-)
 delete mode 100644 Gemfile
 delete mode 100644 Gemfile.lock
 delete mode 100644 Rakefile
 delete mode 100755 generators/grid5000
 delete mode 100644 generators/input/net-links.rb
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/adonis.rb
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/adonis_manual.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/edel.rb
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/edel_manual.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-1.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-10.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-11.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-12.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-13.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-14.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-15.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-16.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-17.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-18.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-19.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-2.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-20.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-21.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-22.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-23.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-24.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-25.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-26.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-27.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-28.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-29.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-3.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-30.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-31.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-32.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-33.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-34.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-35.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-36.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-37.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-38.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-39.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-4.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-40.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-41.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-42.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-43.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-44.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-45.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-46.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-47.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-48.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-49.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-5.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-50.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-51.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-52.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-53.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-54.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-55.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-56.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-57.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-58.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-59.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-6.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-60.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-61.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-62.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-63.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-64.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-65.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-66.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-67.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-68.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-69.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-7.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-70.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-71.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-72.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-8.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/edel/nodes/edel-9.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/genepi.rb
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/genepi_manual.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
 delete mode 100644 generators/input/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
 delete mode 100644 generators/input/sites/grenoble/grenoble.rb
 delete mode 100644 generators/input/sites/grenoble/net-links/gw-grenoble.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/ib-grenoble.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/sw-edel-1.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/sw-edel-2.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/sw-edel-3.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/sw-edel-4.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/voltaire-1.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/voltaire-2.yaml
 delete mode 100644 generators/input/sites/grenoble/net-links/voltaire-3.yaml
 delete mode 100644 generators/input/sites/grenoble/pdus.rb
 delete mode 100644 generators/input/sites/lille/clusters/chimint/chimint.rb
 delete mode 100644 generators/input/sites/lille/clusters/chimint/chimint_manual.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-1.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-10.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-11.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-12.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-13.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-14.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-15.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-16.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-17.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-18.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-19.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-2.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-20.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-3.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-4.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-5.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-6.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-7.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-8.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chimint/nodes/chimint-9.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/chinqchint.rb
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/chinqchint_manual.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/chirloute.rb
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/chirloute_manual.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
 delete mode 100644 generators/input/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
 delete mode 100644 generators/input/sites/lille/lille.rb
 delete mode 100644 generators/input/sites/lille/net-links/gw-lille.yaml
 delete mode 100644 generators/input/sites/lille/net-links/myrinet.yaml
 delete mode 100644 generators/input/sites/lille/pdus.rb
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/granduc.rb
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/granduc_manual.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/petitprince.rb
 delete mode 100644 generators/input/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml
 delete mode 100644 generators/input/sites/luxembourg/luxembourg.rb
 delete mode 100644 generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml
 delete mode 100644 generators/input/sites/luxembourg/net-links/mxl1.yaml
 delete mode 100644 generators/input/sites/luxembourg/net-links/mxl2.yaml
 delete mode 100644 generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
 delete mode 100644 generators/input/sites/luxembourg/pdus.rb
 delete mode 100644 generators/input/sites/lyon/clusters/hercule/hercule.rb
 delete mode 100644 generators/input/sites/lyon/clusters/hercule/hercule_manual.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/orion/nodes/orion-1.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/orion/nodes/orion-2.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/orion/nodes/orion-3.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/orion/nodes/orion-4.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/orion/orion.rb
 delete mode 100644 generators/input/sites/lyon/clusters/orion/orion_manual.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/sagittaire.rb
 delete mode 100644 generators/input/sites/lyon/clusters/sagittaire/sagittaire_manual.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/taurus.rb
 delete mode 100644 generators/input/sites/lyon/clusters/taurus/taurus_manual.yaml
 delete mode 100644 generators/input/sites/lyon/lyon.rb
 delete mode 100644 generators/input/sites/lyon/net-links/force10.yaml
 delete mode 100644 generators/input/sites/lyon/net-links/gw-lyon.yaml
 delete mode 100644 generators/input/sites/lyon/net-links/pat.yaml
 delete mode 100644 generators/input/sites/lyon/net-links/salome.yaml
 delete mode 100644 generators/input/sites/lyon/pdus.rb
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/graoully.rb
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/graoully_manual.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/graphene.rb
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/graphene_manual.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/graphique.rb
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphite/graphite.rb
 delete mode 100644 generators/input/sites/nancy/clusters/graphite/graphite_manual.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/griffon.rb
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/griffon_manual.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/grimoire.rb
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/grimoire_manual.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/grisou.rb
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/grisou_manual.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-1.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-10.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-100.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-101.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-102.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-103.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-104.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-105.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-106.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-107.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-108.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-109.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-11.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-110.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-111.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-112.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-113.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-114.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-115.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-116.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-117.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-118.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-119.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-12.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-120.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-121.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-122.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-123.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-124.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-125.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-126.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-127.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-128.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-129.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-13.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-130.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-131.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-132.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-133.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-134.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-14.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-15.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-16.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-17.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-18.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-19.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-2.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-20.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-21.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-22.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-23.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-24.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-25.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-26.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-27.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-28.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-29.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-3.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-30.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-31.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-32.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-33.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-34.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-35.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-36.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-37.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-38.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-39.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-4.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-40.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-41.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-42.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-43.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-44.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-45.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-46.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-47.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-48.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-49.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-5.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-50.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-51.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-52.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-53.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-54.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-55.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-56.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-57.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-58.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-59.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-6.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-60.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-61.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-62.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-63.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-64.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-65.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-66.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-67.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-68.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-69.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-7.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-70.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-71.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-72.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-73.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-74.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-75.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-76.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-77.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-78.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-79.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-8.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-80.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-81.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-82.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-83.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-84.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-85.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-86.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-87.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-88.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-89.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-9.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-90.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-91.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-92.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-93.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-94.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-95.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-96.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-97.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-98.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/nodes/talc-99.yaml
 delete mode 100644 generators/input/sites/nancy/clusters/talc/talc.rb
 delete mode 100644 generators/input/sites/nancy/nancy.rb
 delete mode 100644 generators/input/sites/nancy/net-links/gw-nancy.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgraoullyib.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgraphene1.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgraphene2.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgraphene3.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgraphene4.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgrapheneib.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgravillon1.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/sgriffon1.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/stalc1.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/stalc2.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/stalc3.yaml
 delete mode 100644 generators/input/sites/nancy/net-links/stalc4.yaml
 delete mode 100644 generators/input/sites/nancy/pdus.rb
 delete mode 100644 generators/input/sites/nantes/clusters/econome/econome.rb
 delete mode 100644 generators/input/sites/nantes/clusters/econome/econome_manual.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-1.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-10.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-11.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-12.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-13.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-14.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-15.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-16.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-17.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-18.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-19.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-2.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-20.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-21.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-22.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-3.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-4.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-5.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-6.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-7.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-8.yaml
 delete mode 100644 generators/input/sites/nantes/clusters/econome/nodes/econome-9.yaml
 delete mode 100644 generators/input/sites/nantes/nantes.rb
 delete mode 100644 generators/input/sites/nantes/net-links/gw-nantes.yaml
 delete mode 100644 generators/input/sites/nantes/pdus.rb
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-1.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-10.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-11.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-12.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-13.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-14.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-15.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-16.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-17.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-18.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-19.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-2.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-20.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-21.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-22.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-23.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-24.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-25.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-26.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-27.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-28.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-29.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-3.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-30.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-31.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-32.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-33.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-34.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-35.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-36.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-37.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-38.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-39.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-4.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-40.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-41.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-42.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-43.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-44.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-5.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-6.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-7.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-8.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/nodes/stremi-9.yaml
 delete mode 100644 generators/input/sites/reims/clusters/stremi/stremi.rb
 delete mode 100644 generators/input/sites/reims/clusters/stremi/stremi_manual.yaml
 delete mode 100644 generators/input/sites/reims/net-links/gw-reims.yaml
 delete mode 100644 generators/input/sites/reims/pdus.rb
 delete mode 100644 generators/input/sites/reims/reims.rb
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/paranoia.rb
 delete mode 100644 generators/input/sites/rennes/clusters/paranoia/paranoia_manual.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/parapide.rb
 delete mode 100644 generators/input/sites/rennes/clusters/parapide/parapide_manual.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/parapluie.rb
 delete mode 100644 generators/input/sites/rennes/clusters/parapluie/parapluie_manual.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/parasilo.rb
 delete mode 100644 generators/input/sites/rennes/clusters/parasilo/parasilo_manual.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/paravance.rb
 delete mode 100644 generators/input/sites/rennes/clusters/paravance/paravance_manual.yaml
 delete mode 100644 generators/input/sites/rennes/net-links/bigdata-sw.yaml
 delete mode 100644 generators/input/sites/rennes/net-links/c6509.yaml
 delete mode 100644 generators/input/sites/rennes/net-links/gw-rennes.yaml
 delete mode 100644 generators/input/sites/rennes/net-links/paravance-sw-1.yaml
 delete mode 100644 generators/input/sites/rennes/net-links/paravance-sw-2.yaml
 delete mode 100644 generators/input/sites/rennes/pdus.rb
 delete mode 100644 generators/input/sites/rennes/rennes.rb
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-1.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-10.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-11.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-12.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-13.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-14.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-15.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-16.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-17.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-18.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-19.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-2.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-20.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-21.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-22.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-23.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-24.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-25.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-26.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-27.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-28.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-29.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-3.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-30.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-31.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-32.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-33.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-34.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-35.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-36.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-37.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-38.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-39.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-4.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-40.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-41.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-42.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-43.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-44.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-45.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-46.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-47.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-48.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-49.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-5.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-50.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-6.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-7.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-8.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/nodes/sol-9.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/sol/sol.rb
 delete mode 100644 generators/input/sites/sophia/clusters/sol/sol_manual.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-1.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-10.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-11.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-12.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-13.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-14.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-15.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-16.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-17.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-18.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-19.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-2.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-20.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-21.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-22.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-23.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-24.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-25.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-26.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-27.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-28.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-29.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-3.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-30.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-31.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-32.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-33.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-34.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-35.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-36.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-37.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-38.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-39.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-4.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-40.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-41.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-42.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-43.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-44.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-45.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-5.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-6.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-7.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-8.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/nodes/suno-9.yaml
 delete mode 100644 generators/input/sites/sophia/clusters/suno/suno.rb
 delete mode 100644 generators/input/sites/sophia/clusters/suno/suno_manual.yaml
 delete mode 100644 generators/input/sites/sophia/net-links/edgeiron.yaml
 delete mode 100644 generators/input/sites/sophia/net-links/gw-sophia.yaml
 delete mode 100644 generators/input/sites/sophia/pdus.rb
 delete mode 100644 generators/input/sites/sophia/sophia.rb
 delete mode 100755 generators/lib/core_extensions.rb
 delete mode 100755 generators/lib/g5k_generator.rb
 delete mode 100644 generators/lib/grid5000.rb
 delete mode 100644 generators/lib/grid5000/cluster.rb
 delete mode 100644 generators/lib/grid5000/node.rb
 delete mode 100644 generators/lib/grid5000/pdu.rb

diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index a9b92968f4..0000000000
--- a/Gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-source :rubygems
-
-gem 'json_pure', '~> 1.5'
-gem 'restfully','1.0.5'
-gem "rake", ">= 0.9.2.2"
-
-gem "net-admin-common",
-  :git => "ssh://g5kadmin@git.grid5000.fr/srv/git/repos/net-admin-common",
-  :tag => "2.5.3"
-gem "cacti-play",
-  :git => "ssh://g5kadmin@git.grid5000.fr/srv/git/repos/cacti-play",
-  :tag => "2.8"
-gem "weathermap",
-  :git => "ssh://g5kadmin@git.grid5000.fr/srv/git/repos/weathermap",
-  :tag => "5.8.4"
-
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index b236b2a356..0000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,91 +0,0 @@
-GIT
-  remote: ssh://g5kadmin@git.grid5000.fr/srv/git/repos/cacti-play
-  revision: 4a2b6cb6ae2d9f791a4529737491ea02eeeb58c8
-  tag: 2.8
-  specs:
-    cacti-play (2.7.4)
-      net-admin-common (>= 2.5.3)
-
-GIT
-  remote: ssh://g5kadmin@git.grid5000.fr/srv/git/repos/net-admin-common
-  revision: 3985600064a0a583ee9a47b4d51c97bc94f291a2
-  tag: 2.5.3
-  specs:
-    net-admin-common (2.5.3)
-      net-ssh (>= 2.3.0)
-      net-ssh-multi (>= 1.1)
-      rest-client (>= 1.6.7)
-
-GIT
-  remote: ssh://g5kadmin@git.grid5000.fr/srv/git/repos/weathermap
-  revision: a258691fb1bdfa8db04897fd593bc2f9d3264b53
-  tag: 5.8.4
-  specs:
-    weathermap (5.8.2)
-      cacti-play (>= 2.7.4)
-      interpolator (>= 0.15)
-      ipaddress (>= 0.8.0)
-      json (>= 1.7.0)
-      net-admin-common (>= 2.5.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.2)
-    backports (2.6.3)
-    bond (0.4.2)
-    interpolator (0.15)
-    ipaddress (0.8.0)
-    json (1.7.4)
-    json_pure (1.7.4)
-    mime-types (1.19)
-    net-ssh (2.6.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rake (0.9.2.2)
-    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.5)
-      addressable
-      backports
-      json (~> 1.5)
-      rack-cache
-      rb-readline
-      rest-client (~> 1.6)
-      rest-client-components
-      ripl (= 0.6.1)
-      ripl-color_streams
-      ripl-multi_line
-      ripl-play (~> 0.2.1)
-      ripl-short_errors
-    ripl (0.6.1)
-      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
-
-DEPENDENCIES
-  cacti-play!
-  json_pure (~> 1.5)
-  net-admin-common!
-  rake (>= 0.9.2.2)
-  restfully (= 1.0.5)
-  weathermap!
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index 6b03ee0f81..0000000000
--- a/Rakefile
+++ /dev/null
@@ -1,287 +0,0 @@
-#
-require 'fileutils'
-require 'json'
-require 'logger'
-require 'restfully'
-
-ROOT_DIR = File.expand_path File.dirname(__FILE__)
-LIB_DIR = File.join(ROOT_DIR, "generators", "lib")
-$LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
-
-require 'grid5000'
-
-task :environment do
-  Dir.chdir(ROOT_DIR)
-  @logger = Logger.new(STDERR)
-  @logger.level = Logger.const_get((ENV['DEBUG'] || 'INFO').upcase)
-end
-
-task :api_sites  do
-  api_logger = Logger.new("/dev/null")
-  api_logger.level = Logger::FATAL
-  @api = Restfully::Session.new(:configuration_file => File.expand_path("~/.restfully/api.grid5000.fr.yml"),:logger => api_logger,:base_uri => 'https://api.grid5000.fr/sid')
-  @api_sites = if ENV['SITE']
-    [@api.root.sites[ENV['SITE'].to_sym]]
-  else
-    @api.root.sites
-  end
-end
-
-task :hosts do
-  # HOSTS=gw.lille
-  # HOSTS=*.lille
-  # SITES=lille => HOSTS=*.lille
-  # SITES=* => HOSTS=*.*
-  site = ENV['SITE']
-  host = ENV['HOST']
-  if site != nil
-    host = "*.#{site}"
-  elsif host != nil
-    abort "HOST must be on the form <hostname>.<site>. You provided '#{host}'." if host.scan(/^(\S+)\.(\S+)$/).empty?
-  else
-    abort "You must provide SITE= , (SITE=lille, or SITE=*), or a HOST, (HOST=gw.lille, or HOST=*.lille, or HOST=sw-*.lille)"
-  end
-  abort "You must provide HOST= , (HOST=gw.lille, or HOST=*.lille, or HOST=sw-*.lille)" if host.nil?
-  @host = host
-end
-
-
-namespace :g5k do
-  desc "Generates the JSON files based on the generators, for all sites.\nUse SITE=<SITE-NAME> if you wish to restrict the generation to a specific site.\nUse DRY=yes to simulate the execution."
-  task :generate => [:environment,:hosts] do
-    host,site = @host.scan(/(\S+)\.(\S+)/).flatten
-    root_dir_input = "#{ROOT_DIR}/generators/input/sites"
-    command = File.join(ROOT_DIR, "generators", "grid5000")
-    command += " " + File.join(root_dir_input, site,"#{site}.rb")
-    command += " " + File.join(root_dir_input, site,"clusters", "*", "#{host}.rb")
-    command += " " + File.join(root_dir_input, site,"clusters", "*", "nodes", "#{host}*.yaml")
-    command += " " + File.join(root_dir_input, site,"clusters", "*", "#{host}_manual.yaml")
-    command += " " + File.join(root_dir_input, site,"pdus.rb")
-
-    command << " -s" if ENV['DRY'] == "yes"
-#    puts command
-    sh command
-  end
-end
-
-# rake deadnodes:reasons
-# rake deadnodes:tofix
-namespace :deadnodes do
-
-  desc "List all dead nodes and the reason why they are dead. (SITE=)"
-  task :reasons => [:environment,:api_sites] do
-    @logger.level = Logger::INFO
-    @reasons = true
-    Rake::Task["deadnodes:browse"].execute
-  end
-  desc "List all nodes which have they state not in synch with they comment. (SITE=)"
-  task :tofix => [:environment,:api_sites] do
-    @logger.level = Logger::ERROR
-    @tofix = true
-    Rake::Task["deadnodes:browse"].execute
-  end
-
-  task :browse do
-    def comment_ok?(comment)
-      comment == "OK"
-    end
-    phoenix = []
-    @api_sites.each do |site|
-      reg = /^([^-]+)-(\d+)/
-      site.status["nodes"].sort{|a,b|
-        a_cluster,a_id = a[0].scan(reg).flatten
-        b_cluster,b_id = b[0].scan(reg).flatten
-        [a_cluster,a_id.to_i] <=> [b_cluster,b_id.to_i]
-      }.each do |uid,status|
-        comment = status["comment"]
-        state = status["hard"].downcase
-        if comment_ok?(comment)
-          if state == "dead"
-            @logger.error "Node '#{uid}' of state '#{state}' should not have comment '#{comment}'" if @tofix
-          else
-            # nothing, good state
-          end
-        else
-          if state == "dead"
-            @logger.info "Node '#{uid}' is dead because '#{comment}'" if @reasons
-          else
-            @logger.error "Node '#{uid}' should have the not-dead-comment 'OK', since its state is '#{state}'. Instead, it has comment '#{comment}'." if @tofix
-            phoenix.push uid if comment.match(/^\[phoenix\]/) != nil
-          end
-        end
-      end
-    end
-    puts phoenix if ENV["PHOENIX"] == "yes"
-  end
-end
-
-# TESTS
-# Deletion:
-#   rake -s oar:generate FROM=4cfebf92e9cce05315782b51e05eded4ab4f0e7e TO=7d2648eaad7dbbc6f1fdb9c0279f73d374ccd47a
-#
-# Update:
-# rake -s oar:generate FROM=7d2648eaad7dbbc6f1fdb9c0279f73d374ccd47a TO=bb528643003757942521942eaeab74b15aaa976d
-#
-# Add:
-#   rake -s oar:generate FROM=be9f7338b9750ce675447c13d172157992041ec1 TO=7dc3a4101a657230b7ad0534025a7ca93c905411
-#
-# All:
-#   rake -s oar:generate FROM=be9f7338b9750ce675447c13d172157992041ec1 TO=7d2648eaad7dbbc6f1fdb9c0279f73d374ccd47a
-#
-namespace :oar do
-  desc "Generates the oaradmin lines to update the OAR database after a change in the reference repository.\nUse FROM=<SHA-ID> and TO=<SHA-ID> to specify the starting and ending commits.\n  Use -s to suppress the 'in directory' announcement.\n  Use SUDO=sudo to prefix the commandes.\n  use PROPS=<comma-separated-list> to limit the update to some properties"
-  task :generate => :environment do
-    if ENV['FROM'].nil? || ENV['FROM'].empty?
-      @logger.fatal "You MUST specify a commit id from where to start using the FROM=<SHA-ID> argument. Ex: rake -s oar:generate FROM=be9f7338b9750ce675447c13d172157992041ec1 TO=7dc3a4101a657230b7ad0534025a7ca93c905411 2> /dev/null"
-      exit(1)
-    end
-    ENV['TO'] ||= 'HEAD'
-    ENV['SUDO'] ||= ''
-    ENV['PROPS'] ||= ''
-    properties = ENV['PROPS'].split(',')
-    @logger.info "Analysing changes between #{ENV['FROM']}..#{ENV['TO']}..."
-
-    commands = []
-    diff = `git diff --name-status #{ENV['FROM']}..#{ENV['TO']}`
-
-    diff.split("\n").each do |line|
-      action, filename = line.split("\t")
-      next unless filename =~ %r{.+/nodes/.+json}
-
-      node_uid, site_uid, grid_uid = filename.gsub(/\.json/,'').split("/").values_at(-1, -5, -7)
-      cluster_uid = node_uid.split("-")[0]
-      host = [node_uid, site_uid, grid_uid, "fr"].flatten.join(".")
-
-      if ENV['SITE'] && !ENV['SITE'].split(",").include?(site_uid)
-        @logger.info "Skipping #{host} since you only want changes that occured on #{ENV['SITE'].inspect}"
-        next
-      end
-
-      command = ""
-
-      case action
-      when "A", "C", "M"
-        node_properties = JSON.parse(File.read(filename))
-        cluster_properties = JSON.parse(File.read(filename.gsub(%r{/nodes.*}, "/#{cluster_uid}.json")))
-        cluster = Grid5000::Cluster.new(cluster_properties)
-        node = Grid5000::Node.new(cluster, node_properties)
-        begin
-          export = node.export("oar-2.4")
-        rescue Grid5000::MissingProperty => e
-          @logger.warn "Error when exporting #{host}: #{e.message}. Skipped."
-          next
-        end
-        if action == "M"  # modification of a file
-          command.concat("#{ENV["SUDO"]} oarnodesetting -h #{host} ")
-          command.concat(" -p ").concat( export.to_a.map{|(k,v)|
-            if v.nil?
-              nil
-            elsif properties.size > 0
-						  if properties.include?(k)
-                 "#{k}=#{v.inspect.gsub("'", "\\'").gsub("\"", "'")}"
-							else 
-							  nil
-              end							
-            else				
-              "#{k}=#{v.inspect.gsub("'", "\\'").gsub("\"", "'")}"
-            end
-          }.compact.join(" -p ") )
-        else              # new file
-          node_number = node_uid.split("-")[1]
-          command.concat("oar_resources_add -H 1 --host0 #{node_number} --host-prefix #{cluster_uid}- --host-suffix .#{site_uid}.#{grid_uid}.fr -C #{node.properties['architecture']['smp_size']} -c #{export['cpucore']}")
-          command.concat(" -a")
-          # Add other properties
-          command.concat(' -A "')
-          if ENV['MAINTENANCE'] && ENV['MAINTENANCE']=='NO'
-            command.concat(' -p maintenance=\'NO\'')
-          else
-            # by default, maintenance is YES when creating new resources
-            command.concat(' -p maintenance=\'YES\'')
-          end
-          # by default, an Alive node has comment "OK"
-          command.concat(' -p comment=\'OK\'')
-          command.concat(" -p ").concat( export.to_a.map{|(k,v)|
-            if v.nil?
-              nil
-            else
-              "#{k}=#{v.inspect.gsub("'", "\\'").gsub("\"", "'")}"
-            end
-          }.compact.join(" -p ") )
-          command.concat('"')
-        end
-      when "D"            # deletion of a file
-        command.concat("oarnodesetting -s Dead -h #{host}")
-      else
-        @logger.warn "Don't know what to do with #{line.inspect}. Ignoring."
-        next
-      end
-
-      if ENV['COMMIT'] && ENV['COMMIT']=='YES'
-        command.concat(' -c')
-      end
-
-      commands << command
-    end
-    commands.each do |command|
-      puts command
-    end
-  end
-end
-
-namespace :netlinks do
-  desc "Generates network API JSON files based on net-links yaml files.\nUse DRY=yes to simulate the execution. "
-  task :generate => [:environment,:hosts] do
-    host,site = @host.scan(/(\S+)\.(\S+)/).flatten
-    root_dir_input = File.join(ROOT_DIR, "generators","input")
-    command = File.join(ROOT_DIR, "generators", "grid5000")
-    command += " " + File.join(root_dir_input, "net-links.rb")
-    command += " " + File.join(root_dir_input,"sites", site,"#{site}.rb")
-    command += " " + File.join(root_dir_input,"sites", site,"net-links","#{host}.yaml")
-
-    command << " -s" if ENV['DRY'] == "yes"
-#    puts command
-    sh command
-  end
-end
-namespace :env do
-  desc "Generates environment JSON files .\nUse DRY=yes to simulate the execution. "
-  task :generate => [:environment] do
-    env_name = ENV["ENV_NAME"]
-    abort "You must provide ENV_NAME=" if env_name.nil?
-    root_dir_input = "#{ROOT_DIR}/generators/input"
-    command = File.join(ROOT_DIR, "generators", "grid5000")
-    command += " " + File.join(root_dir_input, "environments","#{env_name}")
-
-    command << " -s" if ENV['DRY'] == "yes"
-    sh command
-  end
-end
-namespace :weathermap do
-  @weathermap_options = ""
-  task :hosts do
-    @weathermap_site = ENV['SITE']
-    @weathermap_host = ENV['HOST']
-    abort "You must provide the SITE= " if @weathermap_site.nil?
-    abort "You must provide the HOST= name (uid) in its site " if @weathermap_host.nil? or @weathermap_host.match(/\.grid5000\.fr/) != nil
-  end
-  task :execute => ["weathermap:hosts"]  do
-    cmd = "bundle exec weathermap"
-    cmd += " --site '#{@weathermap_site}' --host '#{@weathermap_host}' --api-path #{ROOT_DIR} #{@weathermap_options}"
-    sh cmd
-  end
-  desc "Create weathermaps for host HOST without data."
-  task :testing => ["weathermap:hosts"]  do
-    @weathermap_options.replace("--action write --use-cacti no")
-    Rake::Task['weathermap:execute'].invoke
-  end
-  desc "Create weathermaps for host HOST with RRD from cacti."
-  task :production => ["weathermap:hosts"]  do
-    @weathermap_options.replace("--action write --use-cacti yes")
-    Rake::Task['weathermap:execute'].invoke
-  end
-  desc "Display network links description amongst network equipments."
-  task :display do
-    @weathermap_options.replace("--action display")
-    Rake::Task['weathermap:execute'].invoke
-  end
-end
diff --git a/generators/grid5000 b/generators/grid5000
deleted file mode 100755
index 1191f2ba94..0000000000
--- a/generators/grid5000
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Try installing bundler: `sudo gem install bundler`"
-  exit!
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `sudo bundle install`."
-  exit!
-end
-
-require 'pp'
-require 'fileutils'
-require 'json'
-require 'yaml'
-require 'time'
-require 'optparse'
-require File.dirname(__FILE__)+'/lib/core_extensions'
-require File.dirname(__FILE__)+'/lib/g5k_generator'
-
-options = {:simulate => false}
-option_parser = OptionParser.new do |opts|
-  opts.banner = %{
-  A tool to generate the Grid5000 reference data.
-
-  Usage:
-    ./grid5000 input_files [config_files] [options]
-
-  Notes:
-    * input_files   MUST be .rb files.
-    * config_files  MUST be .yml or .yaml files.
-
-  Examples:
-    ./grid5000 input/*.rb input/*.yaml -s
-    ./grid5000 input/nancy.rb input/nancy.yaml
-    ./grid5000 input/rennes.rb input/lille.rb -s
-
-  Options:}
-  opts.on("-s", "--simulate", "Run in simulation mode (do not write changes). Default to false.") do |v|
-    options[:simulate] = v
-  end
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-
-end
-
-option_parser.parse!
-files = ARGV
-if files.empty?
-  $stderr.puts option_parser.help
-  exit 1
-elsif (files.map{|file| File.exists?(file)}.include? false)
-  $stderr.puts "Error: one of your input or config file does not exist."
-  exit 2
-else
-  input = {}
-  config = {}
-  files.each do |filename|
-    case (ext = File.extname(filename))
-    when ".rb"
-      # all sites have a pdus.rb file. Breaks generation if all sites are generated at the same time
-      input[File.basename(filename, ext)]="" unless input.has_key?(File.basename(filename, ext))
-      input[File.basename(filename, ext)] += File.read(filename)
-    when ".yml", ".yaml"
-      config[File.basename(filename, ext)] = YAML.load_file(filename)
-    else
-      raise ArgumentError, "The file #{filename} is neither an input file nor a config file."
-    end
-  end
-  puts "[Input files:\t\t #{input.keys.join(", ")}]"
-  puts "[Config files:\t\t #{config.keys.join(", ")}]"
-  puts "[Simulation mode:\t #{options[:simulate]}]"
-  generator = G5K::ReferenceGenerator.new({:uid => "grid5000", :type => "grid"}, :input => input, :config => config)
-  data = generator.generate
-  puts "[Add to the raw data for derived properties:\ #{true}]"
-  data = generator.annotate
-  directory_to_write = File.expand_path File.join(File.dirname(__FILE__), "../data")
-  generator.write(directory_to_write, options)
-  exit 0
-end
diff --git a/generators/input/net-links.rb b/generators/input/net-links.rb
deleted file mode 100644
index f468ba5a3c..0000000000
--- a/generators/input/net-links.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Parse net-links given through @config parameter
-# @config parameter contains nothin but net-links yaml configurations
-
-@config.each do |equipment_uid, properties|
-  properties = properties[equipment_uid]
-  site_name = properties["site"]
-  site site_name.to_sym do |site|
-    network_equipment equipment_uid do |uid|
-      # Most properties are directly written as they are from the net-links YAML file to the the JSON file
-      model properties["model"]
-      kind properties["kind"]
-      @context.recursive_merge!(:site => site)
-      snmp_community properties["snmp_community"]
-      weathermap properties["weathermap"] || {}
-      vlans properties["vlans"]
-      routes properties["routes"]
-      channels properties["channels"]
-      backplane_bps properties["backplane_bps"]
-      mtu  properties["mtu"]
-      # Change the format of linecard from Hash to Array
-      linecards_array = []
-      properties["linecards"].each do |linecard_index,linecard|
-        ports = []
-        linecard.delete("ports").each do |port_index,port|
-          port = {"uid"=>port} if port.is_a? String
-          ports[port_index] = port
-        end
-        linecard["ports"] = ports.map{|p| p || {}}
-        linecards_array[linecard_index] = linecard
-      end
-      linecards linecards_array.map{|l| l || {}}
-    end
-  end
-end
diff --git a/generators/input/sites/grenoble/clusters/adonis/adonis.rb b/generators/input/sites/grenoble/clusters/adonis/adonis.rb
deleted file mode 100644
index 5647f8341d..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/adonis.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-site :grenoble do |site_uid|
-
-  cluster :adonis do |cluster_uid|
-    model "Bull R422-E2 dual mobo + Tesla S1070"
-    created_at Time.parse("2010-09-02").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    10.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 7139000000,
-        :node_flops => 55510000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel',
-          :version          => "Device 10c9 (rev 01)",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('grenoble', 'adonis', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('grenoble', 'adonis', node_uid, 'eth0'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel',
-          :version          => "Device 10c9 (rev 01)",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 1.G,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :vendor           => 'Super Micro Computer Inc.',
-          :version          => "1.15",
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac')
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu         => true,
-          :gpu_count   =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_count'),
-          :gpu_vendor  =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_vendor'),
-          :gpu_model   =>  lookup('adonis_manual', node_uid, 'gpu', 'gpu_model'),
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :pdu  => [
-                [ { :port 	=>  lookup('adonis_manual', node_uid, 'sensors', 'measure1'),
-                    :uid			=>  lookup('adonis_manual', node_uid, 'sensors', 'pdu')},
-                  { :port	=> 	lookup('adonis_manual', node_uid, 'sensors', 'measure2'),
-                    :uid			=>  lookup('adonis_manual', node_uid, 'sensors', 'pdu')}
-                ],
-                [ { :measure	=> 	lookup('adonis_manual', node_uid, 'sensors', 'block'),
-                    :uid			=>	lookup('adonis_manual', node_uid, 'sensors', 'pdu')}
-                ]
-              ]
-            }
-          }
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/grenoble/clusters/adonis/adonis_manual.yaml b/generators/input/sites/grenoble/clusters/adonis/adonis_manual.yaml
deleted file mode 100644
index 8268640598..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/adonis_manual.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
----
-adonis-1:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:11'
-  sensors:
-    measure1: outlet-11
-    measure2: outlet-12
-    pdu: adonis-pdu-1
-    block: block-1
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-2:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:12'
-  sensors:
-    measure1: outlet-11
-    measure2: outlet-12
-    pdu: adonis-pdu-1
-    block: block-1
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-3:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:13'
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-1
-    block: block-2
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-4:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:14'
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-1
-    block: block-2
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-5:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:15'
-  sensors:
-    measure1: outlet-5
-    measure2: outlet-6
-    pdu: adonis-pdu-1
-    block: block-1
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-6:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:16'
-  sensors:
-    measure1: outlet-5
-    measure2: outlet-6
-    pdu: adonis-pdu-1
-    block: block-1
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-7:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:17'
-  sensors:
-    measure1: outlet-1
-    measure2: outlet-2
-    pdu: adonis-pdu-2
-    block: block-1
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-8:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:18'
-  sensors:
-    measure1: outlet-1
-    measure2: outlet-2
-    pdu: adonis-pdu-2
-    block: block-1
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-9:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:19'
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-2
-    block: block-2
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
-adonis-10:
-  network_interfaces:
-    eth0:
-      switch_name: gw-grenoble
-      switch_port: '3:20'
-  sensors:
-    measure1: outlet-13
-    measure2: outlet-14
-    pdu: adonis-pdu-2
-    block: block-2
-  gpu:
-    gpu_count: 2
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-C1060
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
deleted file mode 100644
index 295f0bb23d..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-1:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1755
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.1
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7f:d8
-      ip6: fe80::230:48ff:fecc:7fd8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.1
-    eth1:
-      mounted: false
-      mac: 00:30:48:cc:7f:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b0:58
-      ip: 172.17.18.1
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
deleted file mode 100644
index db2846f279..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-10:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1769
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.10
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:83:10
-      ip6: fe80::230:48ff:fecc:8310
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.10
-    eth1:
-      mounted: false
-      mac: 00:30:48:cc:83:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:ad:df
-      ip: 172.17.18.10
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
deleted file mode 100644
index faa2250a8a..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-2:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1759
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.2
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7f:da
-      ip6: fe80::230:48ff:fecc:7fda
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.2
-    eth1:
-      mounted: false
-      mac: 00:30:48:cc:7f:db
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b0:59
-      ip: 172.17.18.2
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
deleted file mode 100644
index 3cb3a2b174..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-3:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:3d49
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.3
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c6:a4
-      ip6: fe80::230:48ff:fecd:c6a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.3
-    eth1:
-      mounted: false
-      mac: 00:30:48:cd:c6:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b5:f6
-      ip: 172.17.18.3
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
deleted file mode 100644
index 485d75e98e..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-4:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45
-      rate: 40000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.4
-      ip6: fe80::230:48ff:ffcc:3d45
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c0:ac
-      ip6: fe80::230:48ff:fecd:c0ac
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.4
-    eth1:
-      mounted: false
-      mac: 00:30:48:cd:c0:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b6:6c
-      ip: 172.17.18.4
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
deleted file mode 100644
index 76031c882b..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-5:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1465
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.5
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7e:0a
-      ip6: fe80::230:48ff:fecc:7e0a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.5
-    eth1:
-      mounted: false
-      mac: 00:30:48:cc:7e:0b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:af:61
-      ip: 172.17.18.5
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
deleted file mode 100644
index 0305bbddfa..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-6:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:4265
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.6
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7a:bc
-      ip6: fe80::230:48ff:fecc:7abc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.6
-    eth1:
-      mounted: false
-      mac: 00:30:48:cc:7a:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:ad:f2
-      ip: 172.17.18.6
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
deleted file mode 100644
index 79ae8277ed..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-7:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:3d41
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.7
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c6:80
-      ip6: fe80::230:48ff:fecd:c680
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.7
-    eth1:
-      mounted: false
-      mac: 00:30:48:cd:c6:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b5:e4
-      ip: 172.17.18.7
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
deleted file mode 100644
index f4694aefa9..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-8:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:3d51
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.8
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c0:ae
-      ip6: fe80::230:48ff:fecd:c0ae
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.8
-    eth1:
-      mounted: false
-      mac: 00:30:48:cd:c0:af
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b6:6d
-      ip: 172.17.18.8
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml b/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
deleted file mode 100644
index 54df50bbbc..0000000000
--- a/generators/input/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-adonis-9:
-  bios:
-    version: R4222X80
-    release_date: 05/20/2010
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:25:90:ff:ff:2f:f1:49
-      rate: 40000000000
-      ip6: fe80::225:90ff:ff2f:f149
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.9
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:25:90:4c:e9:84
-      ip6: fe80::225:90ff:fe4c:e984
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.18.9
-    eth1:
-      mounted: false
-      mac: 00:25:90:4c:e9:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:25:90:4b:bd:b1
-      ip: 172.17.18.9
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      device: sda
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial_number: "1234567890"
-    manufacturer: Bull SAS
-    product_name: bullx
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/edel.rb b/generators/input/sites/grenoble/clusters/edel/edel.rb
deleted file mode 100644
index 0032d59aa7..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/edel.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-site :grenoble do |site_uid|
-
-  cluster :edel do |cluster_uid|
-    model "Bull bullx B500 compute blades"
-    created_at Time.parse("2008-10-03").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    72.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 7134000000,
-        :node_flops => 55450000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'SSD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel',
-          :version          => "82576 Gigabit Network Connection",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('grenoble', 'edel', node_uid),
-          :switch_port      => net_port_lookup('grenoble', 'edel', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel',
-          :version          => "82576 Gigabit Network Connection",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => 40.G,
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-          :device           => "ib1",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 100.M,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :vendor           => "Unknown",
-          :version          => "1.7",
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac')
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :api  => { :metric => "pdu" },
-              :ipmi     => { :sensors => { :Power => "Power" } }
-            }
-          }
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/grenoble/clusters/edel/edel_manual.yaml b/generators/input/sites/grenoble/clusters/edel/edel_manual.yaml
deleted file mode 100644
index 564cbeda50..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/edel_manual.yaml
+++ /dev/null
@@ -1,361 +0,0 @@
----
-edel-1:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/5
-edel-2:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/6
-edel-3:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/7
-edel-4:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/8
-edel-5:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/9
-edel-6:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/10
-edel-7:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/11
-edel-8:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/12
-edel-9:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/13
-edel-10:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/14
-edel-11:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/15
-edel-12:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/16
-edel-13:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/17
-edel-14:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/18
-edel-15:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/19
-edel-16:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/20
-edel-17:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/21
-edel-18:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-1
-      switch_port: Gi1/0/22
-edel-19:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/5
-edel-20:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/6
-edel-21:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/7
-edel-22:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/8
-edel-23:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/9
-edel-24:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/10
-edel-25:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/11
-edel-26:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/12
-edel-27:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/13
-edel-28:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/14
-edel-29:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/15
-edel-30:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/16
-edel-31:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/17
-edel-32:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/18
-edel-33:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/19
-edel-34:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/20
-edel-35:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/21
-edel-36:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-2
-      switch_port: Gi1/0/22
-edel-37:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/5
-edel-38:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/6
-edel-39:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/7
-edel-40:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/8
-edel-41:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/9
-edel-42:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/10
-edel-43:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/11
-edel-44:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/12
-edel-45:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/13
-edel-46:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/14
-edel-47:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/15
-edel-48:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/16
-edel-49:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/17
-edel-50:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/18
-edel-51:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/19
-edel-52:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/20
-edel-53:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/21
-edel-54:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-3
-      switch_port: Gi1/0/22
-edel-55:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/5
-edel-56:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/6
-edel-57:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/7
-edel-58:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/8
-edel-59:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/9
-edel-60:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/10
-edel-61:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/11
-edel-62:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/12
-edel-63:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/13
-edel-64:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/14
-edel-65:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/15
-edel-66:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/16
-edel-67:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/17
-edel-68:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/18
-edel-69:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/19
-edel-70:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/20
-edel-71:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/21
-edel-72:
-  network_interfaces:
-    eth0:
-      switch_name: sw-edel-4
-      switch_port: Gi1/0/22
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-1.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-1.yaml
deleted file mode 100644
index 0b5d9bbda1..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-1.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-edel-1:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5f9e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.1
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:be
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.1
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:df
-      ip: 172.17.17.1
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-10.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-10.yaml
deleted file mode 100644
index 67764ac755..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-10.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-10:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:5f
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c95f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.10
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:94
-      ip6: fe80::a00:38ff:fe35:ab94
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.10
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ca
-      ip: 172.17.17.10
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-11.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-11.yaml
deleted file mode 100644
index 684957724a..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-11.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-11:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:59
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c959
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.11
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:90
-      ip6: fe80::a00:38ff:fe35:ab90
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.11
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:c8
-      ip: 172.17.17.11
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-12.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-12.yaml
deleted file mode 100644
index c2737afdcf..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-12.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-12:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5b
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca5b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.12
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:3c
-      ip6: fe80::a00:38ff:fe35:ac3c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.12
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1e
-      ip: 172.17.17.12
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-13.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-13.yaml
deleted file mode 100644
index d5bc0a49d8..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-13.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-13:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:cb
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9cb
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.13
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:dc
-      ip6: fe80::a00:38ff:fe35:abdc
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.13
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ee
-      ip: 172.17.17.13
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-14.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-14.yaml
deleted file mode 100644
index 4f656d6d6f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-14.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-14:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:83
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c983
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:ac
-      ip6: fe80::a00:38ff:fe35:abac
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.14
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d6
-      ip: 172.17.17.14
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-15.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-15.yaml
deleted file mode 100644
index 82765c6c42..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-15.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-15:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:fb
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9fb
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.15
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:fc
-      ip6: fe80::a00:38ff:fe35:abfc
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.15
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:fe
-      ip: 172.17.17.15
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-16.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-16.yaml
deleted file mode 100644
index e93c4440cf..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-16.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-edel-16:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-    sdb:
-      model: Virtual Floppy
-      device: sdb
-      rev: 1.0
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-    sdb:
-      model: Virtual Floppy
-      device: sdb
-      rev: 1.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:c3
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5ec3
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.16
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:2c
-      ip6: fe80::a00:38ff:fe36:f32c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.16
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:96
-      ip: 172.17.17.16
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-17.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-17.yaml
deleted file mode 100644
index 2ab7a64bb9..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-17.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-17:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C300-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 7.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6e
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c96e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.17
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:9e
-      ip6: fe80::a00:38ff:fe35:ab9e
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.17
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:9f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:cf
-      ip: 172.17.17.17
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-18.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-18.yaml
deleted file mode 100644
index 9120bacc00..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-18.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-18:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:44
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c944
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.18
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:82
-      ip6: fe80::a00:38ff:fe35:ab82
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.18
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:c1
-      ip: 172.17.17.18
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-19.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-19.yaml
deleted file mode 100644
index 14a3394c92..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-19.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-19:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:b9
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.19
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d0
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.19
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:e8
-      ip: 172.17.17.19
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-2.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-2.yaml
deleted file mode 100644
index 1270ae5098..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-2.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-2:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:62:7d
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:627d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.2
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f5:a8
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.2
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f5:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:03
-      ip: 172.17.17.2
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-20.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-20.yaml
deleted file mode 100644
index 5c03119bf2..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-20.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-20:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:35
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c935
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.20
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:78
-      ip6: fe80::a00:38ff:fe35:ab78
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.20
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:bc
-      ip: 172.17.17.20
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-21.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-21.yaml
deleted file mode 100644
index a9ee6958bf..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-21.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-21:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:70
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca70
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.21
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:4a
-      ip6: fe80::a00:38ff:fe35:ac4a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.21
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:4b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:25
-      ip: 172.17.17.21
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-22.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-22.yaml
deleted file mode 100644
index 0bf17971c5..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-22.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-22:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6b
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c96b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.22
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:9c
-      ip6: fe80::a00:38ff:fe35:ab9c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.22
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ce
-      ip: 172.17.17.22
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-23.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-23.yaml
deleted file mode 100644
index 068bac267f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-23.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-23:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c2
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9c2
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d6
-      ip6: fe80::a00:38ff:fe35:abd6
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.23
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:eb
-      ip: 172.17.17.23
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-24.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-24.yaml
deleted file mode 100644
index f90f2e27e7..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-24.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-24:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:3a
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca3a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.24
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:26
-      ip6: fe80::a00:38ff:fe35:ac26
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.24
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:27
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:13
-      ip: 172.17.17.24
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-25.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-25.yaml
deleted file mode 100644
index 78f64d838f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-25.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-25:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:15
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c815
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.25
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:aa:b8
-      ip6: fe80::a00:38ff:fe35:aab8
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.25
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:aa:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:5c
-      ip: 172.17.17.25
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-26.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-26.yaml
deleted file mode 100644
index 98bd6347be..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-26.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-26:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ff
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c8ff
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.26
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:54
-      ip6: fe80::a00:38ff:fe35:ab54
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.26
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:aa
-      ip: 172.17.17.26
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-27.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-27.yaml
deleted file mode 100644
index 233130e7b4..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-27.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-27:
-  bios:
-    release_date: 12/20/2010
-    vendor: INSYDE
-    version: Thurley.3.59.48.0028_BUILD_NCB_N0017
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5e
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca5e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.27
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:3e
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.27
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:3f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1f
-      ip: 172.17.17.27
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-28.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-28.yaml
deleted file mode 100644
index d79281b60e..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-28.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-28:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:6d
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca6d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.28
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:48
-      ip6: fe80::a00:38ff:fe35:ac48
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.28
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:24
-      ip: 172.17.17.28
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-29.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-29.yaml
deleted file mode 100644
index 458b7370ea..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-29.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-29:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9e
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c99e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.29
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:be
-      ip6: fe80::a00:38ff:fe35:abbe
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.29
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:df
-      ip: 172.17.17.29
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-3.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-3.yaml
deleted file mode 100644
index 14ecfc8fd1..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-3.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-3:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:53
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c953
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:8c
-      ip6: fe80::a00:38ff:fe35:ab8c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.3
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:c6
-      ip: 172.17.17.3
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-30.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-30.yaml
deleted file mode 100644
index ff902385fe..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-30.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-30:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:98
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c998
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.30
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:ba
-      ip6: fe80::a00:38ff:fe35:abba
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.30
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:bb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:dd
-      ip: 172.17.17.30
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-31.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-31.yaml
deleted file mode 100644
index a13069b67a..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-31.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-31:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ce:de
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:cede
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.31
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:af:3e
-      ip6: fe80::a00:38ff:fe35:af3e
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.31
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:af:3f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a5:9f
-      ip: 172.17.17.31
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-32.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-32.yaml
deleted file mode 100644
index b898fddbfb..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-32.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-32:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ea
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c8ea
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.32
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:46
-      ip6: fe80::a00:38ff:fe35:ab46
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.32
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:47
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:a3
-      ip: 172.17.17.32
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-33.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-33.yaml
deleted file mode 100644
index 89df03bd44..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-33.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-33:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid:  20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:73
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca73
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.33
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:4c
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.33
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:26
-      ip: 172.17.17.33
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-34.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-34.yaml
deleted file mode 100644
index 3fcbfc1f68..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-34.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-34:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C300-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 7.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:74
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c974
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.34
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:a2
-      ip6: fe80::a00:38ff:fe35:aba2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.34
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:a3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d1
-      ip: 172.17.17.34
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-35.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-35.yaml
deleted file mode 100644
index ae7c86e23d..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-35.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-35:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:14
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c914
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.35
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:62
-      ip6: fe80::a00:38ff:fe35:ab62
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.35
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:63
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:b1
-      ip: 172.17.17.35
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-36.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-36.yaml
deleted file mode 100644
index 22e3e6ef39..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-36.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-36:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:da
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9da
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.36
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:e6
-      ip6: fe80::a00:38ff:fe35:abe6
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.36
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:e7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:f3
-      ip: 172.17.17.3
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-37.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-37.yaml
deleted file mode 100644
index 89f992c87f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-37.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-37:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:8a
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5e8a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.37
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:06
-      ip6: fe80::a00:38ff:fe36:f306
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.37
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:07
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:83
-      ip: 172.17.17.37
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-38.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-38.yaml
deleted file mode 100644
index f2ceb8bc23..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-38.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-38:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bc
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9bc
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.38
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d2
-      ip6: fe80::a00:38ff:fe35:abd2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.38
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:d3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:e9
-      ip: 172.17.17.38
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-39.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-39.yaml
deleted file mode 100644
index 2ad3ba7684..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-39.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-39:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:40
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca40
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.39
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:2a
-      ip6: fe80::a00:38ff:fe35:ac2a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.39
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:15
-      ip: 172.17.17.39
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-4.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-4.yaml
deleted file mode 100644
index aaf8561751..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-4.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-4:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:2d:73
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:2d73
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.4
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:d2:4c
-      ip6: fe80::a00:38ff:fe36:d24c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.4
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:d2:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:9f:26
-      ip: 172.17.17.4
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-40.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-40.yaml
deleted file mode 100644
index 12a0204483..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-40.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-40:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:7d
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c97d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.40
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:a8
-      ip6: fe80::a00:38ff:fe35:aba8
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.40
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d4
-      ip: 172.17.17.40
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-41.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-41.yaml
deleted file mode 100644
index 3c75fd7f7e..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-41.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-41:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:62:77
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:6277
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.41
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f5:a4
-      ip6: fe80::a00:38ff:fe36:f5a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.41
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f5:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:b0:d2
-      ip: 172.17.17.41
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-42.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-42.yaml
deleted file mode 100644
index 65e257d256..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-42.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-42:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:29:c5
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:29c5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.42
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:cf:d8
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.42
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:cf:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:9d:ec
-      ip: 172.17.17.42
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-43.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-43.yaml
deleted file mode 100644
index 88c8310641..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-43.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-43:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bf
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9bf
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.43
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d4
-      ip6: fe80::a00:38ff:fe35:abd4
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.43
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ea
-      ip: 172.17.17.43
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-44.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-44.yaml
deleted file mode 100644
index 65aeabb95c..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-44.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-44:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:80
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c980
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.44
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:aa
-      ip6: fe80::a00:38ff:fe35:abaa
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.44
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:ab
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d5
-      ip: 172.17.17.44
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-45.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-45.yaml
deleted file mode 100644
index a9f5b75326..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-45.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-45:
-  bios:
-    release_date: 12/20/2010
-    vendor: INSYDE
-    version: Thurley.3.59.48.0028_BUILD_NCB_N0017
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:34
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca34
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.45
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:22
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.45
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:23
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:11
-      ip: 172.17.17.45
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-46.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-46.yaml
deleted file mode 100644
index a6882bd01b..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-46.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-46:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:f0
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c8f0
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.46
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:4a
-      ip6: fe80::a00:38ff:fe35:ab4a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.46
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:4b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:a5
-      ip: 172.17.17.46
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-47.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-47.yaml
deleted file mode 100644
index 56d4e1d204..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-47.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-47:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9b
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c99b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.47
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:bc
-      ip6: fe80::a00:38ff:fe35:abbc
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.47
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:de
-      ip: 172.17.17.47
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-48.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-48.yaml
deleted file mode 100644
index 424a43ae19..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-48.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-48:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:29
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c929
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.48
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:70
-      ip6: fe80::a00:38ff:fe35:ab70
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.48
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:b8
-      ip: 172.17.17.48
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-49.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-49.yaml
deleted file mode 100644
index 4308aa89e3..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-49.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-49:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:92
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c992
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.49
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:b6
-      ip6: fe80::a00:38ff:fe35:abb6
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.49
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:db
-      ip: 172.17.17.49
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-5.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-5.yaml
deleted file mode 100644
index 3754291dbf..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-5.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-5:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5ed8
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.5
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:3a
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.5
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:9d
-      ip: 172.17.17.5
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-50.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-50.yaml
deleted file mode 100644
index 689984e535..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-50.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-50:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:19
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca19
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.50
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:10
-      ip6: fe80::a00:38ff:fe35:ac10
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.50
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:08:f1:20:07:b8
-      ip: 172.18.17.50
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-51.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-51.yaml
deleted file mode 100644
index 51c92f9357..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-51.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-51:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:61
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca61
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.51
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:40
-      ip6: fe80::a00:38ff:fe35:ac40
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.51
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:20
-      ip: 172.17.17.51
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-52.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-52.yaml
deleted file mode 100644
index f1bcd343a1..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-52.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-52:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:28
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca28
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.52
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:1a
-      ip6: fe80::a00:38ff:fe35:ac1a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.52
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:1b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:0d
-      ip: 172.17.17.52
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-53.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-53.yaml
deleted file mode 100644
index 6890f3f67c..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-53.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-53:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:4f
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca4f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.53
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:34
-      ip6: fe80::a00:38ff:fe35:ac34
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.53
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1a
-      ip: 172.17.17.53
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-54.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-54.yaml
deleted file mode 100644
index 791951b963..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-54.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-54:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5ed8
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.54
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:3a
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.54
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1d
-      ip: 172.17.17.54
-  block_devices:
-    sda:
-      model: C200-MTFDBAA060M
-      device: sda
-      size: 60022480896
-      rev: 5.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-55.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-55.yaml
deleted file mode 100644
index 91110cce26..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-55.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-55:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:dd
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9dd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.55
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:e8
-      ip6: fe80::a00:38ff:fe35:abe8
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.55
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:f4
-      ip: 172.17.17.55
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-56.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-56.yaml
deleted file mode 100644
index 2d05ffeb83..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-56.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-56:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:01
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca01
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.56
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:00
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.56
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:00
-      ip: 172.17.17.56
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-57.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-57.yaml
deleted file mode 100644
index 26d50895c1..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-57.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-57:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:86
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c986
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.57
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:ae
-      ip6: fe80::a00:38ff:fe35:abae
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.57
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:af
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d7
-      ip: 172.17.17.57
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-58.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-58.yaml
deleted file mode 100644
index 0703d10b11..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-58.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-58:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0d
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca0d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.58
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:08
-      ip6: fe80::a00:38ff:fe35:ac08
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.58
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:04
-      ip: 172.17.17.58
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-59.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-59.yaml
deleted file mode 100644
index d6929f2514..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-59.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-59:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:08
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c908
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.59
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:5a
-      ip6: fe80::a00:38ff:fe35:ab5a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.59
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:5b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ad
-      ip: 172.17.17.59
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-6.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-6.yaml
deleted file mode 100644
index 46fcf077aa..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-6.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-6:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:54:8e
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:548e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.6
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:ec:5e
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.6
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:ec:5f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:2a
-      ip: 172.17.17.6
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-60.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-60.yaml
deleted file mode 100644
index b9c22d043b..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-60.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-60:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:37
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca37
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.60
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:24
-      ip6: fe80::a00:38ff:fe35:ac24
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.60
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:12
-      ip: 172.17.17.60
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-61.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-61.yaml
deleted file mode 100644
index 1e16968bbb..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-61.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-61:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:0b
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c90b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.61
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:5c
-      ip6: fe80::a00:38ff:fe35:ab5c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.61
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ae
-      ip: 172.17.17.61
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-62.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-62.yaml
deleted file mode 100644
index a1bcad13c5..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-62.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-62:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c8
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9c8
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.62
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:da
-      ip6: fe80::a00:38ff:fe35:abda
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.62
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:db
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ed
-      ip: 172.17.17.62
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-63.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-63.yaml
deleted file mode 100644
index 075e3aa60f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-63.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-63:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c98c
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.63
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:b2
-      ip6: fe80::a00:38ff:fe35:abb2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.63
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:b3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d9
-      ip: 172.17.17.63
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-64.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-64.yaml
deleted file mode 100644
index 2b9ae46a6d..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-64.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-edel-64:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:cc:9e
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:cc9e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.64
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ad:be
-      ip6: fe80::a00:38ff:fe35:adbe
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.64
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ad:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:df
-      ip: 172.17.17.64
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-65.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-65.yaml
deleted file mode 100644
index c6646bcb3d..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-65.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-65:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:d7
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9d7
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.65
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:e4
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.65
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:f2
-      ip: 172.17.17.65
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-66.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-66.yaml
deleted file mode 100644
index 6e88690627..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-66.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-66:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:1f
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca1f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.66
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:14
-      ip6: fe80::a00:38ff:fe35:ac14
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.66
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:0a
-      ip: 172.17.17.66
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-67.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-67.yaml
deleted file mode 100644
index 42dc5a7cf4..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-67.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-67:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:f8
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9f8
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.67
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:fa
-      ip6: fe80::a00:38ff:fe35:abfa
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.67
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:fd
-      ip: 172.17.17.67
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-68.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-68.yaml
deleted file mode 100644
index a7ce9a814f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-68.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-68:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:89
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c989
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.68
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:b0
-      ip6: fe80::a00:38ff:fe35:abb0
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.68
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d8
-      ip: 172.17.17.68
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-69.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-69.yaml
deleted file mode 100644
index cfa237a306..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-69.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-69:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9d
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca9d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.69
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:68
-      ip6: fe80::a00:38ff:fe35:ac68
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.69
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:34
-      ip: 172.17.17.69
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-7.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-7.yaml
deleted file mode 100644
index 9ebac144e1..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-7.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-7:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:e1
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c8e1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.7
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:40
-      ip6: fe80::a00:38ff:fe35:ab40
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.7
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:a0
-      ip: 172.17.17.7
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-70.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-70.yaml
deleted file mode 100644
index ca2c00e25c..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-70.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-70:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9a
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca9a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.70
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:66
-      ip6: fe80::a00:38ff:fe35:ac66
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.70
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:33
-      ip: 172.17.17.70
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-71.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-71.yaml
deleted file mode 100644
index 935fcb62f6..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-71.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-71:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:1a
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c91a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.71
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:66
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.71
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:b3
-      ip: 172.17.17.71
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-72.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-72.yaml
deleted file mode 100644
index 60dc5c0241..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-72.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-72:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:cb
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5fcb
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.72
-      driver: mlx4_core
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:dc
-      ip6: fe80::a00:38ff:fe36:f3dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.72
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:ee
-      ip: 172.17.17.72
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-8.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-8.yaml
deleted file mode 100644
index 4b55c6bf5f..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-8.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-8:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:02
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c902
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.8
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:56
-      ip6: fe80::a00:38ff:fe35:ab56
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.8
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:57
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ab
-      ip: 172.17.17.8
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/edel/nodes/edel-9.yaml b/generators/input/sites/grenoble/clusters/edel/nodes/edel-9.yaml
deleted file mode 100644
index fb0a14ce3b..0000000000
--- a/generators/input/sites/grenoble/clusters/edel/nodes/edel-9.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-edel-9:
-  bios:
-    release_date: 10/26/2011
-    vendor: INSYDE
-    version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c5
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9c5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.9
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d8
-      ip6: fe80::a00:38ff:fe35:abd8
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.9
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ec
-      ip: 172.17.17.9
-  block_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: "123456789"
-    manufacturer: INSYDE
-    product_name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/grenoble/clusters/genepi/genepi.rb b/generators/input/sites/grenoble/clusters/genepi/genepi.rb
deleted file mode 100644
index 8e20f2c23e..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/genepi.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-site :grenoble do |site_uid|
-
-  cluster :genepi do |cluster_uid|
-    model "Bull R422-E1"
-    created_at Time.parse("2008-10-01").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    34.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 7651000000,
-          :node_flops => 49650000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ata_piix",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => false,
-          :device           => "eth0",
-          :vendor           => 'Intel',
-          :version          => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => 'Intel',
-          :version          => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :switch           => net_switch_lookup('grenoble', 'genepi', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('grenoble', 'genepi', node_uid, 'eth1'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => 40.G,
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-          :device           => "ib1",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 1.G,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :vendor => "Peppercon AG (10437)",
-          :version => "1.50"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/grenoble/clusters/genepi/genepi_manual.yaml b/generators/input/sites/grenoble/clusters/genepi/genepi_manual.yaml
deleted file mode 100644
index 804b544d5d..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/genepi_manual.yaml
+++ /dev/null
@@ -1,170 +0,0 @@
----
-genepi-1:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:22'
-genepi-2:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:42'
-genepi-3:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:21'
-genepi-4:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:40'
-genepi-5:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:19'
-genepi-6:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-genepi-7:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:20'
-genepi-8:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:39'
-genepi-9:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:18'
-genepi-10:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:37'
-genepi-11:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:9'
-genepi-12:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:38'
-genepi-13:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:17'
-genepi-14:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:29'
-genepi-15:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:7'
-genepi-16:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:25'
-genepi-17:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:6'
-genepi-18:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:27'
-genepi-19:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:16'
-genepi-20:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:31'
-genepi-21:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:10'
-genepi-22:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:32'
-genepi-23:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:14'
-genepi-24:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:30'
-genepi-25:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:15'
-genepi-26:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:8'
-genepi-27:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:4'
-genepi-28:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:33'
-genepi-29:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:3'
-genepi-30:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:28'
-genepi-31:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:13'
-genepi-32:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:34'
-genepi-33:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '4:5'
-genepi-34:
-  network_interfaces:
-    eth1:
-      switch_name: gw-grenoble
-      switch_port: '3:26'
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
deleted file mode 100644
index 1c4d6e33f2..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-1:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:b9
-      rate: 20000000000
-      ip6: fe80::202:c903:1:58b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.1
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:ba
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:85:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:85:bf
-      ip6: fe80::230:48ff:fe7f:85bf
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.1
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d6:b5
-      ip: 172.17.16.1
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00183
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
deleted file mode 100644
index 40a9e61380..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-10:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a5
-      rate: 20000000000
-      ip6: fe80::202:c903:1:59a5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.10
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:fc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:fd
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.10
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d4:2d
-      ip: 172.17.16.10
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00187
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
deleted file mode 100644
index 514f9d3e70..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-11:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:31
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5431
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.11
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:32
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:42:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:42:07
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.11
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d6:90
-      ip: 172.17.16.11
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00188
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
deleted file mode 100644
index 2d0293e99a..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-12:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a1
-      rate: 20000000000
-      ip6: fe80::202:c903:1:59a1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.12
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7e:a3:d4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7e:a3:d5
-      ip6: fe80::230:48ff:fe7e:a3d5
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.12
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:39
-      ip: 172.17.16.12
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00188
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
deleted file mode 100644
index 729fbd24d9..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-13:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c9
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55c9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.13
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ca
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:c7
-      ip6: fe80::230:48ff:fe7f:3ec7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.13
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d4:9a
-      ip: 172.17.16.13
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00189
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
deleted file mode 100644
index 2683443bc0..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-14:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:cd
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55cd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ce
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:f3
-      ip6: fe80::230:48ff:fe7f:41f3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.14
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:40
-      ip: 172.17.16.14
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00189
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
deleted file mode 100644
index 02d7cc4381..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-15:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d9
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.15
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:f3
-      ip6: fe80::230:48ff:fe7f:3ef3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.15
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:2f
-      ip: 172.17.16.15
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00190
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
deleted file mode 100644
index e618d2e6ff..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-16:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e9
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55e9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.16
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ea
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:b8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:b9
-      ip6: fe80::230:48ff:fe7f:3eb9
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.16
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d4:37
-      ip: 172.17.16.16
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00190
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
deleted file mode 100644
index 91ab104982..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-17:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e1
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55e1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.17
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:8a:8c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:8a:8d
-      ip6: fe80::230:48ff:fe7f:8a8d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.17
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:42
-      ip: 172.17.16.17
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00191
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
deleted file mode 100644
index c95be8481b..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-18:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d5
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55d5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.18
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:85:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:85:fb
-      ip6: fe80::230:48ff:fe7f:85fb
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.18
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:4d
-      ip: 172.17.16.18
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00119
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
deleted file mode 100644
index ca93a467e3..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-19:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5d
-      rate: 20000000000
-      ip6: fe80::202:c903:1:565d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.19
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:8a:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:8a:8b
-      ip6: fe80::230:48ff:fe7f:8a8b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.19
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d1:f5
-      ip: 172.17.16.19
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00192
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
deleted file mode 100644
index a272c2c3fb..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-2:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d5
-      rate: 20000000000
-      ip6: fe80::202:c903:1:58d5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.2
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:91:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:91:63
-      ip6: fe80::230:48ff:fe7f:9163
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.2
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d1:e2
-      ip: 172.17.16.2
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00183
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
deleted file mode 100644
index 1a8bcaa614..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-20:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e5
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55e5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.20
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:8a:86
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:8a:87
-      ip6: fe80::230:48ff:fe7f:8a87
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.20
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:bf
-      ip: 172.17.16.20
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00192
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
deleted file mode 100644
index ac10f7201a..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-21:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d1
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55d1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.21
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:f0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:f1
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.21
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:56
-      ip: 172.17.16.21
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00193
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
deleted file mode 100644
index a3f40ab5e7..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-22:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c1
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55c1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.22
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:f5
-      ip6: fe80::230:48ff:fe7f:41f5
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.22
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:fd
-      ip: 172.17.16.22
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00193
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
deleted file mode 100644
index 30fc4b7fdf..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-23:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:31
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5631
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:32
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:dc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:dd
-      ip6: fe80::230:48ff:fe7f:29dd
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.23
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:d1
-      ip: 172.17.16.23
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00194
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
deleted file mode 100644
index 275eb0126c..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-24:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:01
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5b01
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.24
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:02
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:de
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:df
-      ip6: fe80::230:48ff:fe7f:29df
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.24
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d6:ff
-      ip: 172.17.16.24
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00194
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
deleted file mode 100644
index a0260f8b85..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-25:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:01
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5601
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.25
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:02
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5b
-      ip6: fe80::230:48ff:fe7f:415b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.25
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:2d
-      ip: 172.17.16.25
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00195
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
deleted file mode 100644
index 54d3da8130..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-26:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fd
-      rate: 20000000000
-      ip6: fe80::202:c903:1:57fd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.26
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5d
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.26
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d6:08
-      ip: 172.17.16.26
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00195
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
deleted file mode 100644
index 1de332625f..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-27:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:31
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5731
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.27
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:32
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:4f
-      ip6: fe80::230:48ff:fe7f:414f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.27
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:1f
-      ip: 172.17.16.27
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00196
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
deleted file mode 100644
index 768de25e97..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-28:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:59
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5659
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.28
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5f
-      ip6: fe80::230:48ff:fe7f:415f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.28
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d7:76
-      ip: 172.17.16.28
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00196
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
deleted file mode 100644
index 20e98ad0e0..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-29:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b5
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55b5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.29
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:ec
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:ed
-      ip6: fe80::230:48ff:fe7f:29ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.29
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:db
-      ip: 172.17.16.29
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00197
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
deleted file mode 100644
index 5c4a98fa1c..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-3:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:a9
-      rate: 20000000000
-      ip6: fe80::202:c903:1:59a9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:aa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:3f:0a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:3f:0b
-      ip6: fe80::230:48ff:fe7f:3f0b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.3
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:44
-      ip: 172.17.16.3
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00184
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
deleted file mode 100644
index 7861e19c13..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-30:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:61
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5661
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.30
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:62
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:db
-      ip6: fe80::230:48ff:fe7f:29db
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.30
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d4:2f
-      ip: 172.17.16.30
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00197
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
deleted file mode 100644
index bb0b269df3..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-31:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:65
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5665
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.31
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:66
-      rate: 28000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:57
-      ip6: fe80::230:48ff:fe7f:4157
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.31
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac:
-      ip: 172.17.16.31
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00198
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
deleted file mode 100644
index 3946989551..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-32:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ed
-      rate: 20000000000
-      ip6: fe80::202:c903:1:55ed
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.32
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ee
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:50
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:51
-      ip6: fe80::230:48ff:fe7f:4151
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.32
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d7:84
-      ip: 172.17.16.32
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00198
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
deleted file mode 100644
index 8d996e8ec8..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-33:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:05
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5805
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.33
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:06
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:ef
-      ip6: fe80::230:48ff:fe7f:29ef
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.33
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:dc
-      ip: 172.17.16.33
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00199
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
deleted file mode 100644
index 09e5eaae6c..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-34:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:55
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5655
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.34
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:56
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:40
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:41
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.34
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:dd
-      ip: 172.17.16.34
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00199
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
deleted file mode 100644
index 9b0042ef1f..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-4:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:bd
-      rate: 20000000000
-      ip6: fe80::202:c903:1:58bd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.4
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:be
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:44:8c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:44:8d
-      ip6: fe80::230:48ff:fe7f:448d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.4
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:5d
-      ip: 172.17.16.4
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00184
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
deleted file mode 100644
index f79231ebca..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-5:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0d
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5b0d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.5
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:c1:b4:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:c1:b4:a7
-      ip6: fe80::230:48ff:fec1:b4a7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.5
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:93:39:e8
-      ip: 172.17.16.5
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00185
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
deleted file mode 100644
index 6b8633314f..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-6:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2d
-      rate: 20000000000
-      ip6: fe80::202:c903:1:552d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.6
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:2e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:f3
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.6
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac:
-      ip: 172.17.16.6
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00185
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
deleted file mode 100644
index 5b58d48548..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-7:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ad
-      rate: 20000000000
-      ip6: fe80::202:c903:1:59ad
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.7
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:59:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:e0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:e1
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.7
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d1:d2
-      ip: 172.17.16.7
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00186
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
deleted file mode 100644
index ec9c2032a7..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-8:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:19
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5b19
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.8
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:e3
-      ip6: fe80::230:48ff:fe7f:29e3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.8
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d6:94
-      ip: 172.17.16.8
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5S-00186
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml b/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
deleted file mode 100644
index 5be16ad956..0000000000
--- a/generators/input/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-genepi-9:
-  bios:
-    release_date: 04/30/2008
-    vendor: Phoenix Technologies LTD
-    version: 1.1a
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:15
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5b15
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.16.9
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:16
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:3e:eb
-      ip6: fe80::230:48ff:fe7f:3eeb
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.9
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d4:8e
-      ip: 172.17.16.9
-  block_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      device: sda
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial_number: XAN-SM5P-00187
-    manufacturer: Bull SAS
-    product_name: Novascale Universal
diff --git a/generators/input/sites/grenoble/grenoble.rb b/generators/input/sites/grenoble/grenoble.rb
deleted file mode 100644
index 82a16e5226..0000000000
--- a/generators/input/sites/grenoble/grenoble.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :grenoble do |site_uid|
-  name "Grenoble"
-  location "Grenoble, France"
-  web "http://www.grid5000.fr/mediawiki/index.php/Grenoble:Home"
-  description "Grid'5000 Grenoble site"
-  latitude 45.1833
-  longitude 5.7167
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.4.0.0/14"
-  virt_ip_range "10.132.0.0/14"
-  storage5k false
-  production true
-
-  g5ksubnet({
-    :network => '10.132.0.0/14',
-    :gateway => '10.135.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.16.0/20',
-      :gateway => '172.16.31.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.31.119'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.31.120'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.31.121'
-    },
-    '4' => {
-      :network => '10.4.0.0/18',
-      :gateway => '10.4.63.254'
-    },
-    '5' => {
-      :network => '10.4.64.0/18',
-      :gateway => '10.4.127.254'
-    },
-    '6' => {
-      :network => '10.4.128.0/18',
-      :gateway => '10.4.191.254'
-    },
-    '7' => {
-      :network => '10.4.192.0/18',
-      :gateway => '10.4.255.254'
-    },
-    '8' => {
-      :network => '10.5.0.0/18',
-      :gateway => '10.5.63.254'
-    },
-    '9' => {
-      :network => '10.5.64.0/18',
-      :gateway => '10.5.127.254'
-    },
-    '11' => {
-      :network => '10.7.192.0/18',
-      :gateway => '10.7.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/grenoble/net-links/gw-grenoble.yaml b/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
deleted file mode 100644
index eb2114fae2..0000000000
--- a/generators/input/sites/grenoble/net-links/gw-grenoble.yaml
+++ /dev/null
@@ -1,337 +0,0 @@
----
-gw-grenoble:
-  model: ExtremeNetworks
-  kind: router
-  site: grenoble
-  backplane_bps: 800000000000
-  mtu: 9216
-  snmp_community: public
-  routes: {}
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.31.254
-    "vlan101":
-      addresses:
-        - 172.17.31.254
-    "vlan500":
-      addresses:
-        - 192.168.4.15
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.4.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.4.64.0/18
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.4.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.4.192.0/18
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.5.0.0/18
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.5.64.0/18
-    "vlan711":
-      name: kavlan-11
-      addresses:
-        - 10.7.192.0/18
-  linecards:
-    2:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000
-      kind: switch
-      rate: 1000000000
-      ports:
-        1:
-          uid: sw-edel-2
-          port: 0/1
-        2:
-          uid: sw-edel-2
-          port: 0/2
-        3:
-          uid: sw-edel-2
-          port: 0/3
-        4:
-          uid: sw-edel-1
-          port: 0/1
-        5:
-          uid: sw-edel-1
-          port: 0/2
-        6:
-          uid: sw-edel-1
-          port: 0/3
-        7:
-          uid: sw-edel-3
-          port: 0/1
-        8:
-          uid: sw-edel-3
-          port: 0/2
-        9:
-          uid: sw-edel-3
-          port: 0/3
-        10:
-          uid: sw-edel-4
-          port: 0/1
-        11:
-          uid: sw-edel-4
-          port: 0/2
-        12:
-          uid: sw-edel-4
-          port: 0/3
-        23:
-          uid: voltaire-1
-        24:
-          uid: voltaire-2
-    3:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      kind: node
-      backplane_bps: 48000000000
-      rate: 1000000000
-      ports:
-        1:
-          uid: digmgt
-          port: eth0
-          kind: other
-        2:
-          uid: digmgt
-          port: eth1
-          kind: other
-        3:
-          uid: digmgt
-          port: eth2
-          kind: other
-        4:
-          uid: digmgt
-          port: eth3
-          kind: other
-        5:
-          uid: grimage-9
-          port: eth0
-        6:
-          uid: grimage-9
-          port: eth1
-        7:
-          uid: grimage-10
-          port: eth0
-        8:
-          uid: grimage-10
-          port: eth1
-        11:
-          uid: adonis-1
-          port: eth0
-        12:
-          uid: adonis-2
-          port: eth0
-        13:
-          uid: adonis-3
-          port: eth0
-        14:
-          uid: adonis-4
-          port: eth0
-        15:
-          uid: adonis-5
-          port: eth0
-        16:
-          uid: adonis-6
-          port: eth0
-        17:
-          uid: adonis-7
-          port: eth0
-        18:
-          uid: adonis-8
-          port: eth0
-        19:
-          uid: adonis-9
-          port: eth0
-        20:
-          uid: adonis-10
-          port: eth0
-        21:
-          uid: voltaire-3
-          kind: switch
-        25:
-          uid: genepi-16
-          port: eth1
-        26:
-          uid: genepi-34
-          port: eth1
-        27:
-          uid: genepi-18
-          port: eth1
-        28:
-          uid: genepi-30
-          port: eth1
-        29:
-          uid: genepi-14
-          port: eth1
-        30:
-          uid: genepi-24
-          port: eth1
-        31:
-          uid: genepi-20
-          port: eth1
-        32:
-          uid: genepi-22
-          port: eth1
-        33:
-          uid: genepi-28
-          port: eth1
-        34:
-          uid: genepi-32
-          port: eth1
-        37:
-          uid: genepi-10
-          port: eth1
-        38:
-          uid: genepi-12
-          port: eth1
-        39:
-          uid: genepi-8
-          port: eth1
-        40:
-          uid: genepi-4
-          port: eth1
-        41:
-          uid: genepi-6
-          port: eth1
-        42:
-          uid: genepi-2
-          port: eth1
-    4:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000
-      kind: node
-      rate: 1000000000
-      ports:
-        1:
-          uid: summit-grimage
-          kind: switch
-        3:
-          uid: genepi-29
-          port: eth1
-        4:
-          uid: genepi-27
-          port: eth1
-        5:
-          uid: genepi-33
-          port: eth1
-        6:
-          uid: genepi-17
-          port: eth1
-        7:
-          uid: genepi-15
-          port: eth1
-        8:
-          uid: genepi-26
-          port: eth1
-        9:
-          uid: genepi-11
-          port: eth1
-        10:
-          uid: genepi-21
-          port: eth1
-        13:
-          uid: genepi-31
-          port: eth1
-        14:
-          uid: genepi-23
-          port: eth1
-        15:
-          uid: genepi-25
-          port: eth1
-        16:
-          uid: genepi-19
-          port: eth1
-        17:
-          uid: genepi-13
-          port: eth1
-        18:
-          uid: genepi-9
-          port: eth1
-        19:
-          uid: genepi-5
-          port: eth1
-        20:
-          uid: genepi-7
-          port: eth1
-        21:
-          uid: genepi-3
-          port: eth1
-        22:
-          uid: genepi-1
-          port: eth1
-        23:
-          uid: vthd-inria
-          kind: virtual
-        24:
-          uid: alpes
-          port: eth0
-          kind: other
-        25:
-          uid: grimage-1
-          port: eth0
-        26:
-          uid: grimage-2
-          port: eth0
-        27:
-          uid: grimage-3
-          port: eth0
-        28:
-          uid: grimage-4
-          port: eth0
-        29:
-          uid: grimage-5
-          port: eth0
-        30:
-          uid: grimage-6
-          port: eth0
-        31:
-          uid: grimage-7
-          port: eth0
-        32:
-          uid: grimage-8
-          port: eth0
-    10:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000
-      kind: other
-      rate: 10000000000
-      ports:
-        1:
-          uid: dignfs
-          port: eth2
-          rate: 10000000000
-        3:
-          kind: virtual
-          uid: renater-grenoble
-          rate: 10000000000
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/ib-grenoble.yaml b/generators/input/sites/grenoble/net-links/ib-grenoble.yaml
deleted file mode 100644
index 76a57a64d3..0000000000
--- a/generators/input/sites/grenoble/net-links/ib-grenoble.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
---- 
-ib-grenoble: 
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports: 
-        0: voltaire-1
-        1: voltaire-2
-        2: voltaire-3
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/sw-edel-1.yaml b/generators/input/sites/grenoble/net-links/sw-edel-1.yaml
deleted file mode 100644
index 09817ed5e3..0000000000
--- a/generators/input/sites/grenoble/net-links/sw-edel-1.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
---- 
-sw-edel-1:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards:
-    1:
-      naming_pattern: "%LINECARD%/0/%PORT%"
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kind: node
-      rate: 1000000000
-      ports:
-        4: 
-          uid: edel-cmc-1
-          kind: other 
-        5: edel-1
-        6: edel-2
-        7: edel-3
-        8: edel-4
-        9: edel-5
-        10: edel-6
-        11: edel-7
-        12: edel-8
-        13: edel-9
-        14: edel-10
-        15: edel-11
-        16: edel-12
-        17: edel-13
-        18: edel-14
-        19: edel-15
-        20: edel-16
-        21: edel-17
-        22: edel-18
-        25: 
-          uid: gw-grenoble
-          port: "2:4"
-          kind: router
-        26:
-          uid: gw-grenoble
-          port: "2:5"
-          kind: router
-        27:
-          uid: gw-grenoble
-          port: "2:6"
-          kind: router
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/sw-edel-2.yaml b/generators/input/sites/grenoble/net-links/sw-edel-2.yaml
deleted file mode 100644
index 45029198fa..0000000000
--- a/generators/input/sites/grenoble/net-links/sw-edel-2.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
---- 
-sw-edel-2:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    1: 
-      naming_pattern: "%LINECARD%/0/%PORT%"
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kind: node
-      rate: 1000000000
-      ports: 
-        4: 
-          uid: edel-cmc-2
-          kind: other
-        5: edel-19
-        6: edel-20
-        7: edel-21
-        8: edel-22
-        9: edel-23
-        10: edel-24
-        11: edel-25
-        12: edel-26
-        13: edel-27
-        14: edel-28
-        15: edel-29
-        16: edel-30
-        17: edel-31
-        18: edel-32
-        19: edel-33
-        20: edel-34
-        21: edel-35
-        22: edel-36
-        25:
-          uid: gw-grenoble
-          port: "2:1"
-          kind: router
-        26:
-          uid: gw-grenoble
-          port: "2:2"
-          kind: router
-        27:
-          uid: gw-grenoble
-          port: "2:3"
-          kind: router
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/sw-edel-3.yaml b/generators/input/sites/grenoble/net-links/sw-edel-3.yaml
deleted file mode 100644
index ad651d80c2..0000000000
--- a/generators/input/sites/grenoble/net-links/sw-edel-3.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
---- 
-sw-edel-3:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    1: 
-      naming_pattern: "%LINECARD%/0/%PORT%"
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kind: node
-      rate: 1000000000
-      ports: 
-        4: 
-          uid: edel-cmc-3
-          kind: other
-        5: edel-37
-        6: edel-38
-        7: edel-39
-        8: edel-40
-        9: edel-41
-        10: edel-42
-        11: edel-43
-        12: edel-44
-        13: edel-45
-        14: edel-46
-        15: edel-47
-        16: edel-48
-        17: edel-49
-        18: edel-50
-        19: edel-51
-        20: edel-52
-        21: edel-53
-        22: edel-54
-        25:
-          uid: gw-grenoble
-          port: "2:7"
-          kind: router
-        26:
-          uid: gw-grenoble
-          port: "2:8"
-          kind: router
-        27:
-          uid: gw-grenoble
-          port: "2:9"
-          kind: router
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/sw-edel-4.yaml b/generators/input/sites/grenoble/net-links/sw-edel-4.yaml
deleted file mode 100644
index ed3ab6c092..0000000000
--- a/generators/input/sites/grenoble/net-links/sw-edel-4.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
---- 
-sw-edel-4:
-  model: Broadcom
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  mtu: 9216
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    1:
-      naming_pattern: "%LINECARD%/0/%PORT%"
-      snmp_pattern: "Unit: %LINECARD% Slot: 0 Port: %PORT% Gigabit - Level"
-      kind: node
-      rate: 1000000000
-      ports: 
-        4:
-          kind: other
-          uid: edel-cmc-4
-        5: edel-55
-        6: edel-56
-        7: edel-57
-        8: edel-58
-        9: edel-59
-        10: edel-60
-        11: edel-61
-        12: edel-62
-        13: edel-63
-        14: edel-64
-        15: edel-65
-        16: edel-66
-        17: edel-67
-        18: edel-68
-        19: edel-69
-        20: edel-70
-        21: edel-71
-        22: edel-72
-        25:
-          uid: gw-grenoble
-          port: "2:10"
-          kind: router
-        26:
-          uid: gw-grenoble
-          port: "2:11"
-          kind: router
-        27:
-          uid: gw-grenoble
-          port: "2:12"
-          kind: router
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/voltaire-1.yaml b/generators/input/sites/grenoble/net-links/voltaire-1.yaml
deleted file mode 100644
index 93cb09d7e7..0000000000
--- a/generators/input/sites/grenoble/net-links/voltaire-1.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
---- 
-voltaire-1:
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports: 
-        0: ib-grenoble 
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/voltaire-2.yaml b/generators/input/sites/grenoble/net-links/voltaire-2.yaml
deleted file mode 100644
index f1da78c33e..0000000000
--- a/generators/input/sites/grenoble/net-links/voltaire-2.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-voltaire-2:
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports: 
-        0: ib-grenoble
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/net-links/voltaire-3.yaml b/generators/input/sites/grenoble/net-links/voltaire-3.yaml
deleted file mode 100644
index 0134fe3294..0000000000
--- a/generators/input/sites/grenoble/net-links/voltaire-3.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
---- 
-voltaire-3:
-  model: Infiniband
-  kind: switch
-  site: grenoble
-  snmp_community: public
-  weathermap: 
-    use_cacti: "no"
-  vlans: 
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards: 
-    0: 
-      naming_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports: 
-        0: ib-grenoble
-  channels: 
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/grenoble/pdus.rb b/generators/input/sites/grenoble/pdus.rb
deleted file mode 100644
index 6849097f05..0000000000
--- a/generators/input/sites/grenoble/pdus.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-site :grenoble do |site_uid|
-
-  2.times do |i|
-    pdu "adonis-pdu-#{i+1}" do |pdu_uid|
-      vendor "Eaton Corporation"
-      model "ePDU C20 16A"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0"
-            }
-          }
-        }
-      ]
-    end
-  end
-end
-
diff --git a/generators/input/sites/lille/clusters/chimint/chimint.rb b/generators/input/sites/lille/clusters/chimint/chimint.rb
deleted file mode 100644
index 80d0d1c637..0000000000
--- a/generators/input/sites/lille/clusters/chimint/chimint.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-site :lille do |site_uid|
-
-  cluster :chimint do |cluster_uid|
-    model "Dell PowerEdge R410"
-    created_at Time.parse("2011-03-25").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    20.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 7456000000,
-        :node_flops => 55610000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :raid       => "0",
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Broadcom',
-          :version          => 'NetXtreme II BCM5716',
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :switch           => net_switch_lookup('lille', 'chimint', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('lille', 'chimint', node_uid, 'eth0'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Broadcom',
-          :version          => 'NetXtreme II BCM5716',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-impi.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-  end # cluster chimint
-end
diff --git a/generators/input/sites/lille/clusters/chimint/chimint_manual.yaml b/generators/input/sites/lille/clusters/chimint/chimint_manual.yaml
deleted file mode 100644
index c8c6ef680a..0000000000
--- a/generators/input/sites/lille/clusters/chimint/chimint_manual.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
----
-chimint-1:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/7
-chimint-2:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/9
-chimint-3:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/8
-chimint-4:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/11
-chimint-5:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/10
-chimint-6:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/12
-chimint-7:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/14
-chimint-8:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/13
-chimint-9:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/15
-chimint-10:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/16
-chimint-11:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/17
-chimint-12:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/18
-chimint-13:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/19
-chimint-14:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/20
-chimint-15:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/23
-chimint-16:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/22
-chimint-17:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/21
-chimint-18:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/24
-chimint-19:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/28
-chimint-20:
-  network_interfaces:
-    eth0:
-      switch_port: Gi3/27
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-1.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-1.yaml
deleted file mode 100644
index 3e5ff078c5..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-1.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-1:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d4:7f
-      ip6: fe80::862b:2bff:fe72:d47f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.1
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d4:80
-      ip6: fe80::862b:2bff:fe72:d480
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d4:81
-      ip: 172.17.33.101
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: DQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-10.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-10.yaml
deleted file mode 100644
index 61a9567dc1..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-10.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-10:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d4:49
-      ip6: fe80::862b:2bff:fe72:d449
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.10
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d4:4a
-      ip6: fe80::862b:2bff:fe72:d44a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d4:4b
-      ip: 172.17.33.110
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 9QM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-11.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-11.yaml
deleted file mode 100644
index fbc93514f4..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-11.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-11:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:c9:9d
-      ip6: fe80::862b:2bff:fe70:c99d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.11
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:c9:9e
-      ip6: fe80::862b:2bff:fe70:c99e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:c9:9f
-      ip: 172.17.33.111
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: BRM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-12.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-12.yaml
deleted file mode 100644
index 71e772fa57..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-12.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-12:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:ea
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.12
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:eb
-      ip6: fe80::862b:2bff:fe70:c622
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:ec
-      ip: 172.17.33.112
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: BQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-13.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-13.yaml
deleted file mode 100644
index 097f796fd5..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-13.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-13:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:71:f1:24
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.13
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:71:f1:25
-      ip6: fe80::862b:2bff:fe70:c622
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:71:f1:26
-      ip: 172.17.33.113
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 9RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-14.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-14.yaml
deleted file mode 100644
index cb522020ec..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-14.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-14:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:67
-      ip6: fe80::862b:2bff:fe72:d567
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.14
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:68
-      ip6: fe80::862b:2bff:fe72:d568
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:69
-      ip: 172.17.33.114
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: CQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-15.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-15.yaml
deleted file mode 100644
index c30b15e407..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-15.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-15:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d7:7a
-      ip6: fe80::862b:2bff:fe72:d77a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.15
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d7:7b
-      ip6: fe80::862b:2bff:fe72:d77b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d7:7c
-      ip: 172.17.33.115
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: HQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-16.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-16.yaml
deleted file mode 100644
index b3fb1c7235..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-16.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-16:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:db
-      ip6: fe80::862b:2bff:fe72:d5db
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.16
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:dc
-      ip6: fe80::862b:2bff:fe72:d5dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:dd
-      ip: 172.17.33.116
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: JQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-17.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-17.yaml
deleted file mode 100644
index 4a9aecfe34..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-17.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-17:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:f6:92
-      ip6: fe80::862b:2bff:fe70:f692
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.17
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:f6:93
-      ip6: fe80::862b:2bff:fe70:f693
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:f6:94
-      ip: 172.17.33.117
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 8QM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-18.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-18.yaml
deleted file mode 100644
index 24acdc9282..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-18.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-18:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d7:89
-      ip6: fe80::862b:2bff:fe72:d789
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.18
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d7:8a
-      ip6: fe80::862b:2bff:fe72:d78a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d7:8b
-      ip: 172.17.33.118
-  chassis:
-    serial_number: GQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-19.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-19.yaml
deleted file mode 100644
index ae406b38c1..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-19.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-19:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:c6:21
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.19
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:c6:22
-      ip6: fe80::862b:2bff:fe70:c622
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:c6:23
-      ip: 172.17.33.119
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 1RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-2.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-2.yaml
deleted file mode 100644
index 585a00f2df..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-2.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-2:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:4f:4c
-      ip6: fe80::862b:2bff:fe70:4f4c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.2
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:4f:4d
-      ip6: fe80::862b:2bff:fe70:4f4d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:4f:4e
-      ip: 172.17.33.102
-  chassis:
-    serial_number: 8RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-20.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-20.yaml
deleted file mode 100644
index 790eb46dde..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-20.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-20:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:c3:d5
-      ip6: fe80::862b:2bff:fe70:c3d5
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.20
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:c3:d6
-      ip6: fe80::862b:2bff:fe70:c3d6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:c3:d7
-      ip: 172.17.33.120
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 7RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-3.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-3.yaml
deleted file mode 100644
index af2d1ee851..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-3.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-3:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:4e:1e
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.3
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:4e:1f
-      ip6: fe80::862b:2bff:fe70:c622
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:4e:20
-      ip: 172.17.33.103
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 2RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-4.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-4.yaml
deleted file mode 100644
index 16c6a38905..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-4.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-4:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:48:31:43
-      ip6: fe80::862b:2bff:fe48:3143
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.4
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:48:31:44
-      ip6: fe80::862b:2bff:fe48:3144
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:48:31:45
-      ip: 172.17.33.104
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 3RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-5.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-5.yaml
deleted file mode 100644
index d1d0d8fa28..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-5.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-5:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:cc:92
-      ip6: fe80::862b:2bff:fe70:cc92
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.5
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:70:cc:93
-      ip6: fe80::862b:2bff:fe70:cc93
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:cc:94
-      ip: 172.17.33.105
-  chassis:
-    serial_number: 6RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-6.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-6.yaml
deleted file mode 100644
index f14c81f3c7..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-6.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-6:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:9e
-      ip6: fe80::862b:2bff:fe72:d59e
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.6
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:9f
-      ip6: fe80::862b:2bff:fe72:d59f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:a0
-      ip: 172.17.33.106
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: FQM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-7.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-7.yaml
deleted file mode 100644
index 40de75b7c2..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-7.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-7:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:b3:44
-      ip6: fe80::862b:2bff:fe72:b344
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.7
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:b3:45
-      ip6: fe80::862b:2bff:fe72:b345
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:b3:46
-      ip: 172.17.33.107
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  chassis:
-    serial_number: 5RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-8.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-8.yaml
deleted file mode 100644
index 10852dbadf..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-8.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-8:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:da:c3
-      ip6: fe80::862b:2bff:fe72:dac3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.8
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:da:c4
-      ip6: fe80::862b:2bff:fe72:dac4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:da:c5
-      ip: 172.17.33.108
-  chassis:
-    serial_number: CRM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chimint/nodes/chimint-9.yaml b/generators/input/sites/lille/clusters/chimint/nodes/chimint-9.yaml
deleted file mode 100644
index 13d69ea3ae..0000000000
--- a/generators/input/sites/lille/clusters/chimint/nodes/chimint-9.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chimint-9:
-  bios:
-    version: 1.5.3
-    release_date: 10/22/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:cb:e3
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.33.9
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
-      rate: 1000000000
-      mac: 84:2b:2b:72:cb:e4
-      ip6: fe80::862b:2bff:fe70:c622
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:cb:e5
-      ip: 172.17.33.109
-  block_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 4RM1Z4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/chinqchint.rb b/generators/input/sites/lille/clusters/chinqchint/chinqchint.rb
deleted file mode 100644
index 29e7e80567..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/chinqchint.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-site :lille do |site_uid|
-
-  cluster :chinqchint do |cluster_uid|
-    model "Altix Xe 310"
-    created_at nil
-    created_at Time.parse("2007-09-10").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    46.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 8695000000,
-        :node_flops => 52250000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA II',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :version          => '80003ES2LAN',
-          :device           => "eth0",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :switch           => "gw-lille",
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => 'Intel',
-          :version          => '80003ES2LAN',
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :switch           => net_switch_lookup('lille', 'chinqchint', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('lille', 'chinqchint', node_uid, 'eth1'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface            => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'interface'),
-          :rate                 => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'rate'),
-          :network_address      => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6                  => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'mac'),
-          :vendor               => 'Myricom',
-          :version              => "10G-PCIE-8A-C",
-          :driver               => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'mounted'),
-          :management           => false,
-          :device               => "myri0",
-          :switch               => 'switch-myri'
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 100.M,
-          :network_address      => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/lille/clusters/chinqchint/chinqchint_manual.yaml b/generators/input/sites/lille/clusters/chinqchint/chinqchint_manual.yaml
deleted file mode 100644
index eb4e6a712d..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/chinqchint_manual.yaml
+++ /dev/null
@@ -1,185 +0,0 @@
----
-chinqchint-1:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/1
-chinqchint-2:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/2
-chinqchint-3:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/3
-chinqchint-4:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/4
-chinqchint-5:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/5
-chinqchint-6:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/6
-chinqchint-7:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/7
-chinqchint-8:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/8
-chinqchint-9:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/9
-chinqchint-10:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/10
-chinqchint-11:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/11
-chinqchint-12:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/12
-chinqchint-13:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/26
-chinqchint-14:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/29
-chinqchint-15:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/15
-chinqchint-16:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/16
-chinqchint-17:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/17
-chinqchint-18:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/18
-chinqchint-19:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/19
-chinqchint-20:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/20
-chinqchint-21:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/21
-chinqchint-22:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/22
-chinqchint-23:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/23
-chinqchint-24:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/24
-chinqchint-25:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/25
-chinqchint-26:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/26
-chinqchint-27:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/27
-chinqchint-28:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/28
-chinqchint-29:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/29
-chinqchint-30:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/30
-chinqchint-31:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/31
-chinqchint-32:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/32
-chinqchint-33:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/33
-chinqchint-34:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/30
-chinqchint-35:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/31
-chinqchint-36:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/28
-chinqchint-37:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/37
-chinqchint-38:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/38
-chinqchint-39:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/39
-chinqchint-40:
-  network_interfaces:
-    eth1:
-      switch_port: Gi2/40
-chinqchint-41:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/1
-chinqchint-42:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/2
-chinqchint-43:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/3
-chinqchint-44:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/4
-chinqchint-45:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/5
-chinqchint-46:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/41
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
deleted file mode 100644
index b652c2cc24..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-1:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.101
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:7c:86
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.1
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7c:87
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.1
-    bmc:
-      mac: 00:30:48:96:07:e5
-      ip: 172.17.34.101
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004740
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
deleted file mode 100644
index a828dfab42..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-10:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:35
-      ip6: fe80::260:ddff:fe47:4d35
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.110
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:81:08
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.10
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:09
-      ip6: fe80::230:48ff:fe7c:8109
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.10
-    bmc:
-      mac: 00:30:48:94:2d:7a
-      ip: 172.17.34.110
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004760
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
deleted file mode 100644
index edefad9123..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-11:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:30
-      ip6: fe80::260:ddff:fe47:4d30
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.111
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:67:b0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.11
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:67:b1
-      ip6: fe80::230:48ff:fe7c:67b1
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.11
-    bmc:
-      mac:
-      ip: 172.17.34.111
-  chassis:
-    serial_number: X0004758
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
deleted file mode 100644
index eb5daf3e53..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-12:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6c
-      ip6: fe80::260:ddff:fe47:4c6c
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.112
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.12
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:b9
-      ip6: fe80::230:48ff:fe7c:6eb9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.12
-    bmc:
-      mac:
-      ip: 172.17.34.112
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004758
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
deleted file mode 100644
index 4b4dbb603f..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-13:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:8d
-      ip6: fe80::260:ddff:fe47:498d
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.113
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:00:86
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.13
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:00:87
-      ip6: fe80::230:48ff:fe7c:87
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.13
-    bmc:
-      mac: 00:30:48:94:36:4c
-      ip: 172.17.34.113
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004757
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
deleted file mode 100644
index 7c341b1245..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-14:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:8a
-      ip6: fe80::260:ddff:fe47:498a
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.114
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:00:74
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.14
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:00:75
-      ip6: fe80::230:48ff:fe7c:75
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.14
-    bmc:
-      mac: 00:30:48:94:35:de
-      ip: 172.17.34.114
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004757
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
deleted file mode 100644
index 400b41f515..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-15:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:9c
-      ip6: fe80::260:ddff:fe47:499c
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.115
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:7f:9e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.15
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7f:9f
-      ip6: fe80::230:48ff:fe7c:7f9f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.15
-    bmc:
-      mac: 00:30:48:96:25:b9
-      ip: 172.17.34.115
-  chassis:
-    serial_number: X0004741
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
deleted file mode 100644
index 15e2c6cba9..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-16:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:32
-      ip6: fe80::260:ddff:fe47:4d32
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.116
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:80:fe
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.16
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:ff
-      ip6: fe80::230:48ff:fe7c:80ff
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.16
-    bmc:
-      mac: 00:30:48:96:24:e1
-      ip: 172.17.34.116
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004741
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
deleted file mode 100644
index 1b9a65f21f..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-17:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:85
-      ip6: fe80::260:ddff:fe47:4985
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.117
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:5c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.17
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:5d
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.17
-    bmc:
-      mac: 00:30:48:96:26:5a
-      ip: 172.17.34.117
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004746
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
deleted file mode 100644
index 8272a68df4..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-18:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:31
-      ip6: fe80::260:ddff:fe47:4d31
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.118
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:67:de
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.18
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:67:df
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.18
-    bmc:
-      mac: 00:30:48:96:25:76
-      ip: 172.17.34.118
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004746
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
deleted file mode 100644
index 24ad03021a..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-19:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:eb
-      ip6: fe80::260:ddff:fe47:49eb
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.119
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:0c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.19
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:0d
-      ip6: fe80::230:48ff:fe7c:6f0d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.19
-    bmc:
-      mac: 00:30:48:96:25:de
-      ip: 172.17.34.119
-  chassis:
-    serial_number: X0004748
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
deleted file mode 100644
index 788c62f240..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-2:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b8
-      ip6: fe80::260:ddff:fe47:4bb8
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.102
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:7f:22
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.2
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7f:23
-      ip6: fe80::230:48ff:fe7c:7f23
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.2
-    bmc:
-      mac: 00:30:48:96:25:67
-      ip: 172.17.34.102
-  chassis:
-    serial_number: X0004740
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
deleted file mode 100644
index ab6e6c8812..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-20:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:86
-      ip6: fe80::260:ddff:fe47:4986
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.120
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:67:bc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.20
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:67:bd
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.20
-    bmc:
-      mac: 00:30:48:96:25:c7
-      ip: 172.17.34.120
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004748
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
deleted file mode 100644
index 73a8b034bd..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-21:
-  bios:
-    version: 6.0
-    release_date: 04/09/2008
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:ee
-      ip6: fe80::260:ddff:fe47:49ee
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.121
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:70:a6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.21
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:70:a7
-      ip6: fe80::230:48ff:fe7c:70a7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.21
-    bmc:
-      mac: 00:30:48:94:4a:34
-      ip: 172.17.34.121
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  chassis:
-    serial_number: X1------
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
deleted file mode 100644
index 372e9bdfdb..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-22:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e3
-      ip6: fe80::260:ddff:fe47:49e3
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.122
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:da
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.22
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:db
-      ip6: fe80::230:48ff:fe7c:3ddb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.22
-    bmc:
-      mac: 00:30:48:94:4b:02
-      ip: 172.17.34.122
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004739
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
deleted file mode 100644
index a04cb4de8c..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-23:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:f2
-      ip6: fe80::260:ddff:fe47:49f2
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.123
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:80:f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.23
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:f9
-      ip6: fe80::230:48ff:fe7c:80f9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.23
-    bmc:
-      mac: 00:30:48:94:2c:9c
-      ip: 172.17.34.123
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004752
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
deleted file mode 100644
index b404aa9ed8..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-24:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:f1
-      ip6: fe80::260:ddff:fe47:49f1
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.124
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:80:e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.24
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:e9
-      ip6: fe80::230:48ff:fe7c:80e9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.24
-    bmc:
-      mac: 00:30:48:94:2d:76
-      ip: 172.17.34.124
-  chassis:
-    serial_number: X0004752
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
deleted file mode 100644
index 7d5a5c905b..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-25:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:dd
-      ip6: fe80::260:ddff:fe47:4cdd
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.125
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:81:0a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.25
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:0b
-      ip6: fe80::230:48ff:fe7c:810b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.25
-    bmc:
-      mac: 00:30:48:9b:1a:cf
-      ip: 172.17.34.125
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004755
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
deleted file mode 100644
index 206f1cb214..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-26:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:ab
-      ip6: fe80::260:ddff:fe47:4bab
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.126
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:80:ea
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.26
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:80:eb
-      ip6: fe80::230:48ff:fe7c:80eb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.26
-    bmc:
-      mac: 00:30:48:96:26:54
-      ip: 172.17.34.126
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  chassis:
-    serial_number: X0004755
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
deleted file mode 100644
index 42d45a4bec..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-27:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:ec
-      ip6: fe80::260:ddff:fe47:49ec
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.127
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.27
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:b5
-      ip6: fe80::230:48ff:fe7c:6eb5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.27
-    bmc:
-      mac: 00:30:48:96:25:63
-      ip: 172.17.34.127
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: X0004747
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
deleted file mode 100644
index 99ca39f095..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-28:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e5
-      ip6: fe80::260:ddff:fe47:49e5
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.128
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:da
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.28
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:db
-      ip6: fe80::230:48ff:fe7c:6edb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.28
-    bmc:
-      mac: 00:30:48:96:26:b2
-      ip: 172.17.34.128
-  chassis:
-    serial_number: X0004747
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
deleted file mode 100644
index 58031e433e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-29:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:45
-      ip6: fe80::260:ddff:fe47:4d45
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.129
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:81:2a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.29
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:2b
-      ip6: fe80::230:48ff:fe7c:812b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.29
-    bmc:
-      mac: 00:30:48:94:37:d3
-      ip: 172.17.34.129
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004753
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
deleted file mode 100644
index ca0e8ff36e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-3:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:bb
-      ip6: fe80::260:ddff:fe47:4cbb
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.103
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7b:fd:0e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.3
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7b:fd:0f
-      ip6: fe80::230:48ff:fe7b:fd0f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.3
-    bmc:
-      mac: 00:30:48:94:4a:7e
-      ip: 172.17.34.103
-  chassis:
-    serial_number: X0004742
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
deleted file mode 100644
index 2493498e23..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-30:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b0
-      ip6: fe80::260:ddff:fe47:4bb0
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.130
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:bb:fa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.30
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:bb:fb
-      ip6: fe80::230:48ff:fe7c:bbfb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.30
-    bmc:
-      mac:
-      ip: 172.17.34.130
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004753
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
deleted file mode 100644
index ec1ffe8180..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-31:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e1
-      ip6: fe80::260:ddff:fe47:49e1
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.131
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7b:f9:7a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.31
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7b:f9:7b
-      ip6: fe80::230:48ff:fe7b:f97b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.31
-    bmc:
-      mac:
-      ip: 172.17.34.131
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004759
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
deleted file mode 100644
index 35d5b4862e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-32:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e9
-      ip6: fe80::260:ddff:fe47:49e9
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.132
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7b:f9:76
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.32
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7b:f9:77
-      ip6: fe80::230:48ff:fe7b:f977
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.32
-    bmc:
-      mac:
-      ip: 172.17.34.132
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004759
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
deleted file mode 100644
index 3503148ee7..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-33:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e0
-      ip6: fe80::260:ddff:fe47:49e0
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.133
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7a:56:32
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.33
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:56:33
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.33
-    bmc:
-      mac:
-      ip: 172.17.34.133
-  block_devices:
-    sda:
-      model: ST3250620NS
-      device: sda
-      size: 250059350016
-      rev: 3.AEK
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004754
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
deleted file mode 100644
index 0a86339b14..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-34:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:b8
-      ip6: fe80::260:ddff:fe47:49b8
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.134
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7a:5f:16
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.34
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:5f:17
-      ip6: fe80::230:48ff:fe7a:5f17
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.34
-    bmc:
-      mac:
-      ip: 172.17.34.134
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004754
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
deleted file mode 100644
index 21fa40403e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-35:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e2
-      ip6: fe80::260:ddff:fe47:49e2
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.135
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:f4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.35
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:f5
-      ip6: fe80::230:48ff:fe7c:3df5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.35
-    bmc:
-      mac:
-      ip: 172.17.34.135
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004743
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
deleted file mode 100644
index b87fa59a01..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-36:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:b7
-      ip6: fe80::260:ddff:fe47:49b7
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.136
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7d:2d:04
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.36
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:2d:05
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.36
-    bmc:
-      mac:
-      ip: 172.17.34.136
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004743
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
deleted file mode 100644
index 669a1a293f..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-37:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e4
-      ip6: fe80::260:ddff:fe47:49e4
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.137
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:81:04
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.37
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:05
-      ip6: fe80::230:48ff:fe7c:8105
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.37
-    bmc:
-      mac:
-      ip: 172.17.34.137
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004751
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
deleted file mode 100644
index 6090a9dd2e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-38:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b2
-      ip6: fe80::260:ddff:fe47:4bb2
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.138
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:7c:80
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.38
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:7c:81
-      ip6: fe80::230:48ff:fe7c:7c81
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.38
-    bmc:
-      mac: 00:30:48:94:1c:9a
-      ip: 172.17.34.138
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004751
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
deleted file mode 100644
index 9833322f27..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-chinqchint-39:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b1
-      ip6: fe80::260:ddff:fe47:4bb1
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.139
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7d:0f:14
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.39
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:0f:15
-      ip6: fe80::230:48ff:fe7d:f15
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.39
-    bmc:
-      mac: 00:30:48:94:2f:6e
-      ip: 172.17.34.139
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-    sdb:
-      model: Virtual Disc 1
-      device: sdb
-      rev: 0.01
-  chassis:
-    serial_number: X0004738
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
deleted file mode 100644
index 4756b97ec9..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-4:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:b8
-      ip6: fe80::260:ddff:fe47:4cb8
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.104
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7d:2f:1a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.4
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:2f:1b
-      ip6: fe80::230:48ff:fe7d:2f1b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.4
-    bmc:
-      mac: 00:30:48:94:44:21
-      ip: 172.17.34.104
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  chassis:
-    serial_number: X0004742
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
deleted file mode 100644
index 2890578119..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-40:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:af
-      ip6: fe80::260:ddff:fe47:4baf
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.140
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7d:35:74
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.40
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7d:35:75
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.40
-    bmc:
-      mac: 00:30:48:94:4b:4c
-      ip: 172.17.34.140
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004738
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
deleted file mode 100644
index 6d7f7d1186..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-41:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:48
-      ip6: fe80::260:ddff:fe47:4d48
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.141
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7a:5b:de
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.41
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:5b:df
-      ip6: fe80::230:48ff:fe7a:5bdf
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.41
-    bmc:
-      mac: 00:30:48:96:07:ef
-      ip: 172.17.34.141
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: X0004756
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
deleted file mode 100644
index 0bcea15d4c..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-42:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:c0
-      ip6: fe80::260:ddff:fe47:4cc0
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.142
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7a:5c:e4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.42
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7a:5c:e5
-      ip6: fe80::230:48ff:fe7a:5ce5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.42
-    bmc:
-      mac: 00:30:48:96:07:f1
-      ip: 172.17.34.142
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: X0004756
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
deleted file mode 100644
index 59553cc822..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-43:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:ba
-      ip6: fe80::260:ddff:fe47:4bba
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.143
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.43
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:e9
-      ip6: fe80::230:48ff:fe7c:6ee9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.43
-    bmc:
-      mac: 00:30:48:96:25:e1
-      ip: 172.17.34.143
-  chassis:
-    serial_number: X0004750
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
deleted file mode 100644
index 687e7efce3..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-44:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.144
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:66:ec
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.44
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:66:ed
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.44
-    bmc:
-      mac: 00:30:48:96:25:d1
-      ip: 172.17.34.144
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004750
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
deleted file mode 100644
index e06eb9fe67..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-45:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b4
-      ip6: fe80::260:ddff:fe47:4bb4
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.145
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:70:a0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.45
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:70:a1
-      ip6: fe80::230:48ff:fe7c:70a1
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.45
-    bmc:
-      mac: 00:30:48:96:25:65
-      ip: 172.17.34.145
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  chassis:
-    serial_number: X0004749
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
deleted file mode 100644
index 1d9f6d6c6b..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-46:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.146
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:82
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.46
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6f:83
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.46
-    bmc:
-      mac: 00:30:48:96:08:02
-      ip: 172.17.34.146
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004750
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
deleted file mode 100644
index ffa8581386..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-5:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e7
-      ip6: fe80::260:ddff:fe47:49e7
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.105
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:be
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.5
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:bf
-      ip6: fe80::230:48ff:fe7c:6ebf
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.5
-    bmc:
-      mac: 00:30:48:96:25:dd
-      ip: 172.17.34.105
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004745
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
deleted file mode 100644
index a676f43dc1..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-6:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:49:cb
-      ip6: fe80::260:ddff:fe47:49cb
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.106
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:bc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.6
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:6e:bd
-      ip6: fe80::230:48ff:fe7c:6ebd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.6
-    bmc:
-      mac: 00:30:48:96:25:e0
-      ip: 172.17.34.106
-  chassis:
-    serial_number: X0004745
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
deleted file mode 100644
index e4580b477e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-7:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:d5
-      ip6: fe80::260:ddff:fe47:4cd5
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.107
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.7
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:d5
-      ip6: fe80::230:48ff:fe7c:3dd5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.7
-    bmc:
-      mac: 00:30:48:96:07:fa
-      ip: 172.17.34.107
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  chassis:
-    serial_number: X0004744
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
deleted file mode 100644
index 58b217c49e..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-8:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.108
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:d6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.8
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:3d:d7
-      ip6: fe80::230:48ff:fe7c:66ed
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.8
-    bmc:
-      mac: 00:30:48:96:07:e4
-      ip: 172.17.34.108
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: X0004750
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml b/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
deleted file mode 100644
index 3c320243df..0000000000
--- a/generators/input/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-chinqchint-9:
-  bios:
-    version: 6.0
-    release_date: 09/10/2007
-    vendor: Phoenix Technologies LTD
-  network_interfaces:
-    myri0:
-      mounted: false
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6f
-      ip6: fe80::260:ddff:fe47:4c6f
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.109
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7c:81:06
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.17.34.9
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7c:81:07
-      ip6: fe80::230:48ff:fe7c:8107
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.34.9
-    bmc:
-      mac: 00:30:48:94:1b:e2
-      ip: 172.17.34.109
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDT72502
-      device: sda
-      size: 250059350016
-      rev: A7EA
-  chassis:
-    serial_number: X0004760
-    manufacturer: SGI.COM
-    product_name: AltixXE310
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2830000000
-    other_description: Intel(R) Xeon(R) CPU           E5440  @ 2.83GHz
-    version: E5440
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/chirloute.rb b/generators/input/sites/lille/clusters/chirloute/chirloute.rb
deleted file mode 100644
index 98d92da305..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/chirloute.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-site :lille do |site_uid|
-
-  cluster :chirloute do |cluster_uid|
-    model "Dell PowerEdge C6100"
-    created_at Time.parse("2011-03-25").httpdate
-    priority "201199"
-    kavlan true
-    queues ['default', 'admin']
-
-    8.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 7593000000,
-        :node_flops => 58460000000
-       })
-
-        architecture({
-        :smp_size => 2,
-        :smt_size => 8,
-        :platform_type => "x86_64"
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "mptsas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :raid       => "0",
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :vendor           => 'Intel',
-          :version          => '82576EB',
-          :bridged          => false,
-          :device           => "eth0",
-          :network_address  => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :switch           => "gw-lille",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => 'Intel',
-          :version          => '82576EB',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => net_switch_lookup('lille', 'chirloute', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('lille', 'chirloute', node_uid, 'eth1'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :vendor               => 'Inventec',
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-          :vendor               => "Inventec",
-          :version              => 1.14
-
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu        => 'shared',
-          :gpu_count  => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_count'),
-          :gpu_vendor => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_vendor'),
-          :gpu_model => lookup('chirloute_manual', node_uid, 'gpu', 'gpu_model'),
-        })
-
-      end
-    end
-  end # cluster chirloute
-end
diff --git a/generators/input/sites/lille/clusters/chirloute/chirloute_manual.yaml b/generators/input/sites/lille/clusters/chirloute/chirloute_manual.yaml
deleted file mode 100644
index e1aa29aa56..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/chirloute_manual.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-1:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/25
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-2:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/25
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-3:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/44
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-4:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/26
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-5:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/23
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-6:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/31
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-7:
-  network_interfaces:
-    eth1:
-      switch_port: Gi4/23
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
-chirloute-8:
-  network_interfaces:
-    eth1:
-      switch_port: Gi3/32
-  gpu:
-    gpu_count: 4
-    gpu_vendor: Nvidia
-    gpu_model: Tesla-S2050
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
deleted file mode 100644
index 41d1c78553..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-1:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:18:e4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.1
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:18:e5
-      ip6: fe80::226:6cff:fef9:18e5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.1
-    bmc:
-      mac: 00:26:6c:f9:18:e7
-      ip: 172.17.35.101
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  chassis:
-    serial_number: D385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
deleted file mode 100644
index e9df46b565..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-2:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATEi
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:17:e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.2
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:17:e9
-      ip6: fe80::226:6cff:fef9:1609
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.2
-    bmc:
-      mac: 00:26:6c:f9:17:ea
-      ip: 172.17.35.102
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: D385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
deleted file mode 100644
index a0655a126c..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-3:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:15:70
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.3
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:15:71
-      ip6: fe80::226:6cff:fef9:1571
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.3
-    bmc:
-      mac: 00:26:6c:f9:15:73
-      ip: 172.17.35.103
-  chassis:
-    serial_number: D385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
deleted file mode 100644
index f5c048024b..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-4:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:19:60
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.4
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:19:61
-      ip6: fe80::226:6cff:fef9:1609
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.4
-    bmc:
-      mac: 00:26:6c:f9:19:63
-      ip: 172.17.35.104
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: D385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
deleted file mode 100644
index a8020b4909..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-5:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:16:08
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.5
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:16:09
-      ip6: fe80::226:6cff:fef9:1609
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.5
-    bmc:
-      mac: 00:26:6c:f9:16:0a
-      ip: 172.17.35.105
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: F385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
deleted file mode 100644
index ca5ee16d35..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-6:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:17:20
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.6
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:17:21
-      ip6: fe80::226:6cff:fef9:1609
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.6
-    bmc:
-      mac: 00:26:6c:f9:17:22
-      ip: 172.17.35.106
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: F385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
deleted file mode 100644
index 97aee22160..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-7:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:17:b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.7
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:17:b9
-      ip6: fe80::226:6cff:fef9:17b9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.7
-    bmc:
-      mac: 00:26:6c:f9:17:ba
-      ip: 172.17.35.107
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  chassis:
-    serial_number: F385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8580497408
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml b/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
deleted file mode 100644
index f83b3733bb..0000000000
--- a/generators/input/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-chirloute-8:
-  bios:
-    version: 1.66
-    release_date: 12/23/2011
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
-  network_interfaces:
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:26:6c:f9:19:80
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.8
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:6c:f9:19:81
-      ip6: fe80::226:6cff:fef9:1609
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.35.8
-    bmc:
-      mac: 00:26:6c:f9:19:82
-      ip: 172.17.35.108
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: F385Z4J
-    manufacturer: Dell
-    product_name: C6100
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/lille/lille.rb b/generators/input/sites/lille/lille.rb
deleted file mode 100644
index a60705b900..0000000000
--- a/generators/input/sites/lille/lille.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :lille do |site_uid|
-  name "Lille"
-  location "Lille, France"
-  web "http://www.grid5000.fr/mediawiki/index.php/Lille:Home"
-  description "Grid5000 Lille site"
-  latitude 50.6500
-  longitude 3.0833
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.8.0.0/14"
-  virt_ip_range "10.136.0.0/14"
-  storage5k false
-  production true
-
-  g5ksubnet({
-    :network => '10.136.0.0/14',
-    :gateway => '10.139.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.32.0/20',
-      :gateway => '172.16.47.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.47.131'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.47.132'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.47.133'
-    },
-    '4' => {
-      :network => '10.8.0.0/18',
-      :gateway => '10.8.63.254'
-    },
-    '5' => {
-      :network => '10.8.64.0/18',
-      :gateway => '10.8.127.254'
-    },
-    '6' => {
-      :network => '10.8.128.0/18',
-      :gateway => '10.8.191.254'
-    },
-    '7' => {
-      :network => '10.8.192.0/18',
-      :gateway => '10.8.255.254'
-    },
-    '8' => {
-      :network => '10.9.0.0/18',
-      :gateway => '10.9.63.254'
-    },
-    '9' => {
-      :network => '10.9.64.0/18',
-      :gateway => '10.9.127.254'
-    },
-    '12' => {
-      :network => '10.11.192.0/18',
-      :gateway => '10.11.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/lille/net-links/gw-lille.yaml b/generators/input/sites/lille/net-links/gw-lille.yaml
deleted file mode 100644
index c5ac27e278..0000000000
--- a/generators/input/sites/lille/net-links/gw-lille.yaml
+++ /dev/null
@@ -1,263 +0,0 @@
----
-gw-lille:
-  model: cisco WS-C6506-E
-  kind: router
-  site: lille
-  snmp_community: public
-  routes: {}
-  backplane_bps: 720000000000
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.47.254
-    "vlan101":
-      addresses:
-        - 172.17.47.254
-    "vlan500":
-      addresses:
-        - 192.168.4.18
-    "vlan536":
-      addresses:
-        - 193.51.183.177
-    "vlan537":
-      addresses:
-        - 172.16.223.254
-    "vlan541":
-      addresses:
-        - 192.168.69.2
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.8.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.8.64.0/18
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.8.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.8.192.0/18
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.9.0.0/18
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.9.64.0/18
-    "vlan712":
-      name: kavlan-12
-      addresses:
-        - 10.11.192.0/18
-
-  linecards:
-    6:
-      kind: router
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      ports:
-        2: interco-NR-Lille
-    1:
-      kind: virtual
-      naming_pattern: Te%LINECARD%/%PORT%
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 10000000000
-      ports:
-        1: renater-lille
-    2:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      port: eth1
-      ports:
-          1: chimint-1
-          2: chimint-2
-          3: chimint-3
-          4: chimint-4
-          5: chimint-5
-          6: chimint-6
-          7: chimint-7
-          8: chimint-8
-          9: chimint-9
-          10: chimint-10
-          11: chimint-11
-          12: chimint-12
-          13: chimint-13
-          14: chimint-14
-          15: chimint-15
-          16: chimint-16
-          17: chimint-17
-          18: chimint-18
-          19: chimint-19
-          20: chimint-20
-          21:
-            uid: chirloute-1
-            port: eth0
-          22:
-            uid: chirloute-2
-            port: eth0
-          23:
-            uid: chirloute-3
-            port: eth0
-          24:
-            uid: chirloute-4
-            port: eth0
-          25:
-            uid: chirloute-5
-            port: eth0
-          26:
-            uid: chirloute-6
-            port: eth0
-          27:
-            uid: chirloute-7
-            port: eth0
-          28:
-            uid: chirloute-8
-            port: eth0
-
-    3:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      port: eth0
-      ports:
-          1:
-            uid: chinqchint-39
-            port: eth1
-          2:
-            uid: chinqchint-40
-            port: eth1
-          3:
-            uid: chinqchint-41
-            port: eth1
-          4:
-            uid: chinqchint-42
-            port: eth1
-          5:
-            uid: chinqchint-43
-            port: eth1
-          6:
-            uid: chinqchint-44
-            port: eth1
-          7:
-            uid: chinqchint-45
-            port: eth1
-          8:
-            uid: chinqchint-46
-            port: eth1
-          9: chimint-1
-          10: chimint-2
-          11: chimint-3
-          12: chimint-4
-          13: chimint-5
-          14: chimint-6
-          15: chimint-7
-          16: chimint-8
-          17: chimint-9
-          18: chimint-10
-          19: chimint-11
-          20: chimint-12
-          21: chimint-13
-          22: chimint-14
-          23: chimint-15
-          24: chimint-16
-          25: chimint-17
-          26: chimint-18
-          27: chimint-19
-          28: chimint-20
-          29:
-            uid: chirloute-1
-            port: eth1
-          30:
-            uid: chirloute-2
-            port: eth1
-          31:
-            uid: chirloute-3
-            port: eth1
-          32:
-            uid: chirloute-4
-            port: eth1
-          33:
-            uid: chirloute-5
-            port: eth1
-          34:
-            uid: chirloute-6
-            port: eth1
-          35:
-            uid: chirloute-7
-            port: eth1
-          36:
-            uid: chirloute-8
-            port: eth1
-    4:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      port: eth1
-      ports:
-        1: chinqchint-1
-        2: chinqchint-2
-        3: chinqchint-3
-        4: chinqchint-4
-        6: chinqchint-6
-        7: chinqchint-7
-        8: chinqchint-8
-        9: chinqchint-9
-        10: chinqchint-10
-        11: chinqchint-11
-        12: chinqchint-12
-        13: chinqchint-13
-        15: chinqchint-15
-        16: chinqchint-16
-        17: chinqchint-17
-        18: chinqchint-18
-        19: chinqchint-19
-        20: chinqchint-20
-        21: chinqchint-21
-        22: chinqchint-22
-        23: chinqchint-23
-        24: chinqchint-24
-        25: chinqchint-25
-        26: chinqchint-26
-        27: chinqchint-27
-        28: chinqchint-28
-        29: chinqchint-29
-        30: chinqchint-30
-        31: chinqchint-31
-        32: chinqchint-32
-        33: chinqchint-33
-        34: chinqchint-34
-        35: chinqchint-35
-        37: chinqchint-37
-        38: chinqchint-38
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Port-channel%CHANNELID%
diff --git a/generators/input/sites/lille/net-links/myrinet.yaml b/generators/input/sites/lille/net-links/myrinet.yaml
deleted file mode 100644
index 7bbdd2d8a4..0000000000
--- a/generators/input/sites/lille/net-links/myrinet.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-myrinet:
-  model: myricom
-  kind: switch
-  site: lille
-  snmp_community: public
-  routes: {}
-
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan103":
-      administrative: yes
-      addresses:
-        - 172.18.47.200
-  linecards:
-    0:
-      kind: router
-      naming_pattern: Gi%LINECARD%/%PORT%
-      rate: 1000000000
-      ports:
-        1: gw-lille
-  channels:
-    naming_pattern: Po%CHANNELID%
-
diff --git a/generators/input/sites/lille/pdus.rb b/generators/input/sites/lille/pdus.rb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/generators/input/sites/luxembourg/clusters/granduc/granduc.rb b/generators/input/sites/luxembourg/clusters/granduc/granduc.rb
deleted file mode 100644
index b93c5ce4b1..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/granduc.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-site :luxembourg do |site_uid|
-
-  cluster :granduc do |cluster_uid|
-    model "PowerEdge 1950"
-    created_at Time.parse("2011-12-01").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    22.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :node_flops     => 44.07.G,
-        :core_flops     => 6.409.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SAS',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "mptsas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('luxembourg', 'granduc', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('luxembourg', 'granduc', node_uid, 'eth0'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :switch           => net_switch_lookup('luxembourg', 'granduc', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('luxembourg', 'granduc', node_uid, 'eth1'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :switch           => net_switch_lookup('luxembourg', 'granduc', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('luxembourg', 'granduc', node_uid, 'eth2'),
-          :network_address  => "#{node_uid}-eth2.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'ip6'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 10.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 1.G,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :switch           => "gw-luxembourg",
-          :switch_port      => lookup('granduc_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        addressing_plan({
-          :kavlan => "10.40.0.0/14",
-          :virt   => "10.172.0.0/14"
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/luxembourg/clusters/granduc/granduc_manual.yaml b/generators/input/sites/luxembourg/clusters/granduc/granduc_manual.yaml
deleted file mode 100644
index 62f30fab27..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/granduc_manual.yaml
+++ /dev/null
@@ -1,219 +0,0 @@
----
-granduc-1:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/1
-    eth1:
-      switch_port: Gi1/24
-    eth2:
-      switch_port: Eth1/2
-    bmc:
-      switch_port: Gi1/1
-granduc-2:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/2
-    eth1:
-      switch_port: Gi1/25
-    eth2:
-      switch_port: Eth1/3
-    bmc:
-      switch_port: Gi1/2
-granduc-3:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/3
-    eth1:
-      switch_port: Gi1/26
-    eth2:
-      switch_port: Eth1/4
-    bmc:
-      switch_port: Gi1/3
-granduc-4:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/4
-    eth1:
-      switch_port: Gi1/27
-    eth2:
-      switch_port: Eth1/5
-    bmc:
-      switch_port: Gi1/4
-granduc-5:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/5
-    eth1:
-      switch_port: Gi1/28
-    eth2:
-      switch_port: Eth1/6
-    bmc:
-      switch_port: Gi1/5
-granduc-6:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/6
-    eth1:
-      switch_port: Gi1/29
-    eth2:
-      switch_port: Eth1/7
-    bmc:
-      switch_port: Gi1/6
-granduc-7:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/7
-    eth1:
-      switch_port: Gi1/30
-    eth2:
-      switch_port: Eth1/8
-    bmc:
-      switch_port: Gi1/7
-granduc-8:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/8
-    eth1:
-      switch_port: Gi1/31
-    eth2:
-      switch_port: Eth1/9
-    bmc:
-      switch_port: Gi1/8
-granduc-9:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/9
-    eth1:
-      switch_port: Gi1/32
-    eth2:
-      switch_port: Eth1/10
-    bmc:
-      switch_port: Gi1/9
-granduc-10:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/10
-    eth1:
-      switch_port: Gi1/33
-    eth2:
-      switch_port: Eth1/11
-    bmc:
-      switch_port: Gi1/10
-granduc-11:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/11
-    eth1:
-      switch_port: Gi1/34
-    eth2:
-      switch_port: Eth1/12
-    bmc:
-      switch_port: Gi1/11
-granduc-12:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/12
-    eth1:
-      switch_port: Gi2/24
-    eth2:
-      switch_port: Eth1/13
-    bmc:
-      switch_port: Gi1/12
-granduc-13:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/13
-    eth1:
-      switch_port: Gi2/25
-    eth2:
-      switch_port: Eth1/14
-    bmc:
-      switch_port: Gi1/13
-granduc-14:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/14
-    eth1:
-      switch_port: Gi2/26
-    eth2:
-      switch_port: Eth1/15
-    bmc:
-      switch_port: Gi1/14
-granduc-15:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/15
-    eth1:
-      switch_port: Gi2/27
-    eth2:
-      switch_port: Eth1/16
-    bmc:
-      switch_port: Gi1/15
-granduc-16:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/16
-    eth1:
-      switch_port: Gi2/28
-    bmc:
-      switch_port: Gi1/16
-granduc-17:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/17
-    eth1:
-      switch_port: Gi2/29
-    eth2:
-      switch_port: Eth1/18
-    bmc:
-      switch_port: Gi1/17
-granduc-18:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/18
-    eth1:
-      switch_port: Gi2/30
-    eth2:
-      switch_port: Eth1/19
-    bmc:
-      switch_port: Gi1/18
-granduc-19:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/19
-    eth1:
-      switch_port: Gi2/31
-    eth2:
-      switch_port: Eth1/20
-    bmc:
-      switch_port: Gi1/19
-granduc-20:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/20
-    eth1:
-      switch_port: Gi2/32
-    eth2:
-      switch_port: Eth1/21
-    bmc:
-      switch_port: Gi1/20
-granduc-21:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/21
-    eth1:
-      switch_port: Gi2/33
-    eth2:
-      switch_port: Eth1/22
-    bmc:
-      switch_port: Gi1/21
-granduc-22:
-  network_interfaces:
-    eth0:
-      switch_port: Gi2/22
-    eth1:
-      switch_port: Gi2/34
-    eth2:
-      switch_port: Eth1/23
-    bmc:
-      switch_port: Gi1/22
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
deleted file mode 100644
index a341ef592b..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-1:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f0:01:c8
-      ip6: fe80::219:b9ff:fef0:1c8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.1
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f0:01:ca
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.1
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:4b
-      ip6: fe80::21b:21ff:fe34:e14b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.1
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:4a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.1
-      mac: 00:1c:23:c8:69:c2
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 2QV963J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
deleted file mode 100644
index 7ebcc25028..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-10:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:22:19:6d:85:0a
-      ip6: fe80::222:19ff:fe6d:850a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.10
-    eth1:
-      mounted: false
-      mac: 00:22:19:6d:85:0c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.10
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:3d
-      ip6: fe80::21b:21ff:fe34:e13d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.10
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.10
-      mac: 00:1c:23:d3:42:56
-  block_devices:
-    sda:
-      model: ST9300603SS
-      device: sda
-      size: 300000000000
-      rev: FS64
-      vendor: SEAGATE
-  chassis:
-    serial_number: DELL
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
deleted file mode 100644
index 92ef7be33d..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-11:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: MBB2147RC
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0f:46
-      ip6: fe80::219:b9ff:fef2:f46
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.11
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0f:48
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.11
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:27
-      ip6: fe80::21b:21ff:fe34:e127
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.11
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.11
-      mac: 00:1c:23:d3:57:59
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 30W883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
deleted file mode 100644
index 92eaf8fd26..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-12:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:10
-      ip6: fe80::219:b9ff:fef2:e10
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.12
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:12
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.12
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:1c
-      ip6: fe80::21b:21ff:fe34:e11c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.12
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.12
-      mac: 00:1c:23:d3:57:5f
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 50W883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
deleted file mode 100644
index 54b53d5a20..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-13:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:56
-      ip6: fe80::219:b9ff:fef2:e56
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.13
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:58
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.13
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:13:af
-      ip6: fe80::21b:21ff:fe3d:13af
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.13
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:13:ae
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.13
-      mac: 00:1c:23:d3:57:75
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial_number: 40W883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
deleted file mode 100644
index 82cd8e9d0a..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-14:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:03:bb
-      ip6: fe80::219:b9ff:fef2:3bb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.14
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:03:bd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.14
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:11:f7
-      ip6: fe80::21b:21ff:fe3d:11f7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.14
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:11:f6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.14
-      mac: 00:1c:23:d3:57:3b
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 10W883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
deleted file mode 100644
index ed7b5fac67..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-15:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: FUJITSU
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:2e
-      ip6: fe80::219:b9ff:fef2:e2e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.15
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:30
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.15
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e0:f1
-      ip6: fe80::21b:21ff:fe34:e0f1
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.15
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e0:f0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.15
-      mac: 00:1c:23:d3:57:37
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 60W883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
deleted file mode 100644
index a52c5f6fc6..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-16:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0f:4b
-      ip6: fe80::219:b9ff:fef2:f4b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.16
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0f:4d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.16
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:1a
-      ip6: fe80::21b:21ff:fe34:e11a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.16
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:1b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.16
-      mac: 00:1c:23:d3:57:67
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial_number: JZV883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
deleted file mode 100644
index 3a39a83320..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-17:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:de:b9:1c
-      ip6: fe80::219:b9ff:fede:b91c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.17
-    eth1:
-      mounted: false
-      mac: 00:19:b9:de:b9:1e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.17
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3c:87:71
-      ip6: fe80::21b:21ff:fe3c:8771
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.17
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3c:87:70
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.17
-      mac: 00:1c:23:d3:57:89
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial_number: 20W883J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
deleted file mode 100644
index 80f05487bd..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-18:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f3:ba:b0
-      ip6: fe80::219:b9ff:fef3:bab0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.18
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f3:ba:b2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.18
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:07
-      ip6: fe80::21b:21ff:fe34:e107
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.18
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.18
-      mac: 00:1c:23:d6:c4:ea
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MBB2147RC
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  chassis:
-    serial_number: GQ2593J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
deleted file mode 100644
index eafb6f48d4..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-19:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:dd
-      ip6: fe80::219:b9ff:fef2:edd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.19
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:df
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.19
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:13:9b
-      ip6: fe80::21b:21ff:fe3d:139b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.19
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:13:9a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.19
-      mac: 00:1c:23:d3:42:4e
-  chassis:
-    serial_number: 69N983J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
deleted file mode 100644
index 4983d43571..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-2:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f0:01:d7
-      ip6: fe80::219:b9ff:fef0:1d7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.2
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f0:01:d9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.2
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:35
-      ip6: fe80::21b:21ff:fe34:e135
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.2
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:34
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.2
-      mac: 00:1c:23:c8:69:aa
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 1QV963J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
deleted file mode 100644
index abff33fa7b..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-20:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:08:ca
-      ip6: fe80::219:b9ff:fef2:8ca
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.20
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:08:cc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.20
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:13:27
-      ip6: fe80::21b:21ff:fe3d:1327
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.20
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:13:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.20
-      mac: 00:1c:23:d3:42:6c
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial_number: 39N983J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
deleted file mode 100644
index d34b0378f2..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-21:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: MBD2147RC
-      device: sda
-      size: 146815733760
-      rev: D80A
-      vendor: FUJITSU
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f3:c2:7d
-      ip6: fe80::219:b9ff:fef3:c27d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.21
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f3:c2:7f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.21
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:13:7d
-      ip6: fe80::21b:21ff:fe3d:137d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.21
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:13:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.21
-      mac: 00:1c:23:d6:c3:0c
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 1R2593J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
deleted file mode 100644
index ed29b6b211..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-22:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: MBB2147RC
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f3:ba:a6
-      ip6: fe80::219:b9ff:fef3:baa6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.22
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f3:ba:a8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.22
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e0:e7
-      ip6: fe80::21b:21ff:fe34:e0e7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.22
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e0:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.22
-      mac: 00:1c:23:d6:c3:32
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: HQ2593J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
deleted file mode 100644
index e2279a2dce..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-3:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MBB2147RC
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:83
-      ip6: fe80::219:b9ff:fef2:e83
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.3
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:85
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.3
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3c:87:cb
-      ip6: fe80::21b:21ff:fe3c:87cb
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.3
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3c:87:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.3
-      mac: 00:1c:23:d6:c3:0a
-  chassis:
-    serial_number: 3R2593J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
deleted file mode 100644
index 09d10a05cd..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-4:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: MBB2147RC
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0a:e6
-      ip6: fe80::219:b9ff:fef2:ae6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.4
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0a:e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.4
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:12:e9
-      ip6: fe80::21b:21ff:fe3d:12e9
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.4
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:12:e8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.4
-      mac: 00:1c:23:d6:c3:06
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: FQ2593J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
deleted file mode 100644
index b01b39fa54..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-5:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f1:f8:09
-      ip6: fe80::219:b9ff:fef1:f809
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.5
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f1:f8:0b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.5
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:12:d1
-      ip6: fe80::21b:21ff:fe3d:12d1
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.5
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:12:d0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.5
-      mac: 00:1c:23:d3:42:46
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 99N983J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
deleted file mode 100644
index fd22a7fd9f..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-6:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: MBB2147RC
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0c:80
-      ip6: fe80::219:b9ff:fef2:c80
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.6
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0c:82
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.6
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:13:ab
-      ip6: fe80::21b:21ff:fe3d:13ab
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.6
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:13:aa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.6
-      mac: 00:1c:23:d6:c3:08
-  chassis:
-    serial_number: BQ2593J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
deleted file mode 100644
index 8de645131d..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-7:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:6f
-      ip6: fe80::219:b9ff:fef2:e6f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.7
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:71
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.7
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:5f
-      ip6: fe80::21b:21ff:fe34:e15f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.7
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.7
-      mac: 00:1c:23:d3:42:2c
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 49N983J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
deleted file mode 100644
index cbdf8145b4..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-8:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:ee:11:4a
-      ip6: fe80::219:b9ff:feee:114a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.8
-    eth1:
-      mounted: false
-      mac: 00:19:b9:ee:11:4c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.8
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:8d
-      ip6: fe80::21b:21ff:fe34:e18d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.8
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:34:e1:8c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.8
-      mac: 00:1c:23:d3:08:7a
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S229
-      vendor: SEAGATE
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 59N983J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
deleted file mode 100644
index c5febeb3a9..0000000000
--- a/generators/input/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-granduc-9:
-  bios:
-    version: 2.7.0
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f1:fc:49
-      ip6: fe80::219:b9ff:fef1:fc49
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.176.9
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f1:fc:4b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.9
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:14:31
-      ip6: fe80::21b:21ff:fe3d:1431
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.9
-      driver: ixgbe
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 00:1b:21:3d:14:30
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.9
-      mac: 00:1c:23:d3:42:88
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial_number: 89N983J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
deleted file mode 100644
index 874d98d928..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-1:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.1
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:c1
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:c4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.1
-      mac: 00:25:84:e2:eb:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  main_memory:
-    ram_size: 34359738368
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 250059350016
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
deleted file mode 100644
index 6648165c44..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-10:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  main_memory:
-    ram_size: 34359738368
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.10
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:36
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:39
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.10
-      mac: 00:25:84:e2:eb:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
deleted file mode 100644
index 6bb6495675..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-11:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.11
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:43
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:46
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.10
-      mac: 00:25:84:e2:eb:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
deleted file mode 100644
index 3e8de9cde9..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-12:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.12
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:50
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:53
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.12
-      mac: 00:25:84:e2:eb:c0
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  main_memory:
-    ram_size: 34359738368
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
deleted file mode 100644
index 1f864c2f4e..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-13:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.13
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:5d
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:60
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.13
-      mac: 00:25:84:e2:eb:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  main_memory:
-    ram_size: 34359738368
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
deleted file mode 100644
index 09f9d2f9ce..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-14:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.14
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:6a
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:6d
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.14
-      mac: 00:25:84:e2:eb:c0
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
deleted file mode 100644
index 1d75c4abc1..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-15:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.15
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:77
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:7a
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.15
-      mac: 00:25:84:e2:eb:c0
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
deleted file mode 100644
index debc7f3459..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-16:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.16
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:84
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:87
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.16
-      mac: 00:25:84:e2:eb:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
deleted file mode 100644
index d42df941b5..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-2:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.2
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:ce
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:d1
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.2
-      mac: 00:25:84:e2:eb:c0
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
deleted file mode 100644
index 5f3aec580e..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-3:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.3
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:db
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:de
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.3
-      mac: 00:25:84:e2:eb:c0
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  main_memory:
-    ram_size: 34359738368
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
deleted file mode 100644
index aff3f0aab5..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-4:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.4
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:e8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:eb
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.3
-      mac: 00:25:84:e2:eb:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
deleted file mode 100644
index 3c997cf8d4..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-5:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  main_memory:
-    ram_size: 34359738368
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.5
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:f5
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d2:f8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.5
-      mac: 00:25:84:e2:eb:c0
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
deleted file mode 100644
index aea82ab80d..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-6:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.6
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:02
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:05
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.6
-      mac: 00:25:84:e2:eb:c0
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
deleted file mode 100644
index 9707ed156f..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-7:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.7
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:0f
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:12
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.7
-      mac: 00:25:84:e2:eb:c0
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
deleted file mode 100644
index 1982c5dfb7..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-8:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.8
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:1c
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:1f
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.8
-      mac: 00:25:84:e2:eb:c0
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
deleted file mode 100644
index c42d6b7d73..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-petitprince-9:
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: 7.1
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  bios:
-    vendor: Dell Inc.
-    version: 2.5.4
-    release_date: 01/27/2016
-  block_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.177.9
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:29
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 90:b1:1c:ac:d3:2c
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.177.9
-      mac: 00:25:84:e2:eb:c0
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/petitprince.rb b/generators/input/sites/luxembourg/clusters/petitprince/petitprince.rb
deleted file mode 100644
index 1608d728cd..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/petitprince.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-site :luxembourg do |site_uid|
-
-  cluster :petitprince do |cluster_uid|
-    model "PowerEdge M620"
-    created_at Time.parse("2013-09-10").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    16.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :node_flops     => 130.6.G,
-        :core_flops     => 12.14.G
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged 	        => true,
-          :device           => "eth0",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('luxembourg', 'petitprince', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('luxembourg', 'petitprince', node_uid, 'eth0'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged 	        => false,
-          :device           => "eth1",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('luxembourg', 'petitprince', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('luxembourg', 'petitprince', node_uid, 'eth1'),
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 1.G,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :switch           => "gw-luxembourg",
-          :switch_port      => lookup('petitprince_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-        }]
-
-        chassis({
-          :serial       => lookup('petitprince_manual', node_uid, 'chassis', 'serial_number'),
-          :name         => lookup('petitprince_manual', node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup('petitprince_manual', node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        addressing_plan({
-          :kavlan => "10.40.0.0/14",
-          :virt   => "10.172.0.0/14"
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml b/generators/input/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml
deleted file mode 100644
index 3c76351902..0000000000
--- a/generators/input/sites/luxembourg/clusters/petitprince/petitprince_manual.yaml
+++ /dev/null
@@ -1,193 +0,0 @@
----
-petitprince-1:
-  chassis:
-    serial_number: 1NVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/1
-    eth1:
-      switch_port: Te0/1
-    bmc:
-      switch_port: Gi2/36
-petitprince-2:
-  chassis:
-    serial_number: 2MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/2
-    eth1:
-      switch_port: Te0/2
-    bmc:
-      switch_port: Gi2/36
-petitprince-3:
-  chassis:
-    serial_number: 3MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/3
-    eth1:
-      switch_port: Te0/3
-    bmc:
-      switch_port: Gi2/36
-petitprince-4:
-  chassis:
-    serial_number: 4MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/4
-    eth1:
-      switch_port: Te0/4
-    bmc:
-      switch_port: Gi2/36
-petitprince-5:
-  chassis:
-    serial_number: 5MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/5
-    eth1:
-      switch_port: Te0/5
-    bmc:
-      switch_port: Gi2/36
-petitprince-6:
-  chassis:
-    serial_number: 6MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/6
-    eth1:
-      switch_port: Te0/6
-    bmc:
-      switch_port: Gi2/36
-petitprince-7:
-  chassis:
-    serial_number: 7MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/7
-    eth1:
-      switch_port: Te0/7
-    bmc:
-      switch_port: Gi2/36
-petitprince-8:
-  chassis:
-    serial_number: 8MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/8
-    eth1:
-      switch_port: Te0/8
-    bmc:
-      switch_port: Gi2/36
-petitprince-9:
-  chassis:
-    serial_number: 9MVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/9
-    eth1:
-      switch_port: Te0/9
-    bmc:
-      switch_port: Gi2/36
-petitprince-10:
-  chassis:
-    serial_number: BMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/10
-    eth1:
-      switch_port: Te0/10
-    bmc:
-      switch_port: Gi2/36
-petitprince-11:
-  chassis:
-    serial_number: CMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/11
-    eth1:
-      switch_port: Te0/11
-    bmc:
-      switch_port: Gi2/36
-petitprince-12:
-  chassis:
-    serial_number: DMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/12
-    eth1:
-      switch_port: Te0/12
-    bmc:
-      switch_port: Gi2/36
-petitprince-13:
-  chassis:
-    serial_number: FMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/13
-    eth1:
-      switch_port: Te0/13
-    bmc:
-      switch_port: Gi2/36
-petitprince-14:
-  chassis:
-    serial_number: GMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/14
-    eth1:
-      switch_port: Te0/14
-    bmc:
-      switch_port: Gi2/36
-petitprince-15:
-  chassis:
-    serial_number: HMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/15
-    eth1:
-      switch_port: Te0/15
-    bmc:
-      switch_port: Gi2/36
-petitprince-16:
-  chassis:
-    serial_number: JMVTG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge M620
-  network_interfaces:
-    eth0:
-      switch_port: Te0/16
-    eth1:
-      switch_port: Te0/16
-    bmc:
-      switch_port: Gi2/36
diff --git a/generators/input/sites/luxembourg/luxembourg.rb b/generators/input/sites/luxembourg/luxembourg.rb
deleted file mode 100644
index ac6ac486ed..0000000000
--- a/generators/input/sites/luxembourg/luxembourg.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :luxembourg do |site_uid|
-  name "Luxembourg"
-  location "Luxembourg, Luxembourg"
-  web "https://www.grid5000.fr/mediawiki/index.php/Luxembourg:Home"
-  description "Grid'5000 Luxembourg site"
-  latitude 49.626595
-  longitude 6.158676
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.40.0.0/14"
-  virt_ip_range "10.172.0.0/14"
-  storage5k true
-  production true
-
-  g5ksubnet({
-    :network => '10.172.0.0/14',
-    :gateway => '10.175.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.176.0/20',
-      :gateway => '172.16.191.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.191.121'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.191.122'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.191.123'
-    },
-    '4' => {
-      :network => '10.40.0.0/18',
-      :gateway => '10.40.63.254'
-    },
-    '5' => {
-      :network => '10.40.64.0/18',
-      :gateway => '10.40.127.254'
-    },
-    '6' => {
-      :network => '10.40.128.0/18',
-      :gateway => '10.40.191.254'
-    },
-    '7' => {
-      :network => '10.40.192.0/18',
-      :gateway => '10.40.255.254'
-    },
-    '8' => {
-      :network => '10.41.0.0/18',
-      :gateway => '10.41.63.254'
-    },
-    '9' => {
-      :network => '10.41.64.0/18',
-      :gateway => '10.41.127.254'
-    },
-    '20' => {
-      :network => '10.43.192.0/18',
-      :gateway => '10.43.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml
deleted file mode 100644
index c37ddd5fdc..0000000000
--- a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml
+++ /dev/null
@@ -1,387 +0,0 @@
----
-gw-luxembourg:
-  model: cisco WS-C6506-E
-  kind: router
-  site: luxembourg
-  snmp_community: public
-  backplane_bps: 720000000000
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan50":
-      addresses:
-        - 192.168.15.254
-    "vlan100":
-      addresses:
-        - 172.16.191.254
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.254
-    "vlan103":
-      addresses:
-        - 192.168.69.1
-    "vlan500":
-      addresses:
-        - 192.168.4.21
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.40.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.40.64.0/18
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.40.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.40.192.0/18
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.41.0.0/18
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.41.64.0/18
-    "vlan720":
-      name: kavlan-20
-      addresses:
-        - 10.43.192.0/18
-  routes: {}
-
-  linecards:
-    1:
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      kind: node
-      ports:
-#        1:
-#          uid: granduc-1
-#          port: bmc
-#          kind: node
-#        2:
-#          uid: granduc-2
-#          port: bmc
-#          kind: node
-#        3:
-#          uid: granduc-3
-#          port: bmc
-#          kind: node
-#        4:
-#          uid: granduc-4
-#          port: bmc
-#          kind: node
-#        5:
-#          uid: granduc-5
-#          port: bmc
-#          kind: node
-#        6:
-#          uid: granduc-6
-#          port: bmc
-#          kind: node
-#        7:
-#          uid: granduc-7
-#          port: bmc
-#          kind: node
-#        8:
-#          uid: granduc-8
-#          port: bmc
-#          kind: node
-#        9:
-#          uid: granduc-9
-#          port: bmc
-#          kind: node
-#        10:
-#          uid: granduc-10
-#          port: bmc
-#          kind: node
-#        11:
-#          uid: granduc-11
-#          port: bmc
-#          kind: node
-#        12:
-#          uid: granduc-12
-#          port: bmc
-#          kind: node
-#        13:
-#          uid: granduc-13
-#          port: bmc
-#          kind: node
-#        14:
-#          uid: granduc-14
-#          port: bmc
-#          kind: node
-#        15:
-#          uid: granduc-15
-#          port: bmc
-#          kind: node
-#        16:
-#          uid: granduc-16
-#          port: bmc
-#          kind: node
-#        17:
-#          uid: granduc-17
-#          port: bmc
-#          kind: node
-#        18:
-#          uid: granduc-18
-#          port: bmc
-#          kind: node
-#        19:
-#          uid: granduc-19
-#          port: bmc
-#          kind: node
-#        20:
-#          uid: granduc-20
-#          port: bmc
-#          kind: node
-#        21:
-#          uid: granduc-21
-#          port: bmc
-#          kind: node
-#        22:
-#          uid: granduc-22
-#          port: bmc
-#          kind: node
-        23:
-          uid: hera
-          port: eth1
-          kind: other
-        24:
-          uid: granduc-1
-          port: eth1
-        25:
-          uid: granduc-2
-          port: eth1
-        26:
-          uid: granduc-3
-          port: eth1
-        27:
-          uid: granduc-4
-          port: eth1
-        28:
-          uid: granduc-5
-          port: eth1
-        29:
-          uid: granduc-6
-          port: eth1
-        30:
-          uid: granduc-7
-          port: eth1
-        31:
-          uid: granduc-8
-          port: eth1
-        32:
-          uid: granduc-9
-          port: eth1
-        33:
-          uid: granduc-10
-          port: eth1
-        34:
-          uid: granduc-11
-          port: eth1
-        35:
-          uid: cronos
-          port: eth1
-          kind: other
-        36:
-          uid: zeus
-          port: eth0
-          kind: other
-        37:
-          uid: cronos
-          port: eth2
-          kind: other
-        40:
-          uid: zeus
-          port: eth1
-          kind: other
-        46:
-#          uid: ul-grid5000-sw02
-#          port: mgmt0
-#          kind: switch
-        48:
-    2:
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      kind: node
-      ports:
-        1:
-          uid: granduc-1
-          port: eth0
-        2:
-          uid: granduc-2
-          port: eth0
-        3:
-          uid: granduc-3
-          port: eth0
-        4:
-          uid: granduc-4
-          port: eth0
-        5:
-          uid: granduc-5
-          port: eth0
-        6:
-          uid: granduc-6
-          port: eth0
-        7:
-          uid: granduc-7
-          port: eth0
-        8:
-          uid: granduc-8
-          port: eth0
-        9:
-          uid: granduc-9
-          port: eth0
-        10:
-          uid: granduc-10
-          port: eth0
-        11:
-          uid: granduc-11
-          port: eth0
-        12:
-          uid: granduc-12
-          port: eth0
-        13:
-          uid: granduc-13
-          port: eth0
-        14:
-          uid: granduc-14
-          port: eth0
-        15:
-          uid: granduc-15
-          port: eth0
-        16:
-          uid: granduc-16
-          port: eth0
-        17:
-          uid: granduc-17
-          port: eth0
-        18:
-          uid: granduc-18
-          port: eth0
-        19:
-          uid: granduc-19
-          port: eth0
-        20:
-          uid: granduc-20
-          port: eth0
-        21:
-          uid: granduc-21
-          port: eth0
-        22:
-          uid: granduc-22
-          port: eth0
-        24:
-          uid: granduc-12
-          port: eth1
-        25:
-          uid: granduc-13
-          port: eth1
-        26:
-          uid: granduc-14
-          port: eth1
-        27:
-          uid: granduc-15
-          port: eth1
-        28:
-          uid: granduc-16
-          port: eth1
-        29:
-          uid: granduc-17
-          port: eth1
-        30:
-          uid: granduc-18
-          port: eth1
-        31:
-          uid: granduc-19
-          port: eth1
-        32:
-          uid: granduc-20
-          port: eth1
-        33:
-          uid: granduc-21
-          port: eth1
-        34:
-          uid: granduc-22
-          port: eth1
-        44:
-          uid: cronos
-          port: eth0
-          kind: other
-        45:
-#          uid: zeus
-#          port: bmc
-#          kind: other
-        46:
-          uid: hera
-          port: eth0
-          kind: other
-        48:
-    3:
-      naming_pattern: Te%LINECARD%/%PORT%
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      rate: 10000000000
-      backplane_bps: 40000000000
-      kind: switch
-      ports:
-        1:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/30
-        2:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/32
-    5:
-      naming_pattern: Te%LINECARD%/%PORT%
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      kind: virtual
-      ports:
-        4:
-          uid: renater-luxembourg
-          rate: 10000000000
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Port-channel%CHANNELID%
-    "lacp1":
-        - linecard: 1
-          port: 35
-        - linecard: 2
-          port: 44
-    "lacp2":
-        - linecard: 1
-          port: 36
-        - linecard: 1
-          port: 40
-    "lacp3":
-        - linecard: 1
-          port: 23
-        - linecard: 2
-          port: 46
-    "lacp4":
-        - linecard: 3
-          port: 1
-        - linecard: 3
-          port: 2
diff --git a/generators/input/sites/luxembourg/net-links/mxl1.yaml b/generators/input/sites/luxembourg/net-links/mxl1.yaml
deleted file mode 100644
index af6c130e11..0000000000
--- a/generators/input/sites/luxembourg/net-links/mxl1.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
----
-mxl1:
-  model: Force10 MXL
-  kind: switch
-  site: luxembourg
-  snmp_community: public
-  backplane_bps: 1407374880000
-  mtu: 1554
-  weathermap:
-    use_cacti: "yes"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.251
-  routes: {}
-
-  linecards:
-    0:
-      naming_pattern: "Te%LINECARD%/%PORT%"
-      snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      rate: 10000000000
-      kind: node
-      ports:
-        1:
-          uid: petitprince-1
-          port: eth0
-        2:
-          uid: petitprince-2
-          port: eth0
-        3:
-          uid: petitprince-3
-          port: eth0
-        4:
-          uid: petitprince-4
-          port: eth0
-        5:
-          uid: petitprince-5
-          port: eth0
-        6:
-          uid: petitprince-6
-          port: eth0
-        7:
-          uid: petitprince-7
-          port: eth0
-        8:
-          uid: petitprince-8
-          port: eth0
-        9:
-          uid: petitprince-9
-          port: eth0
-        10:
-          uid: petitprince-10
-          port: eth0
-        11:
-          uid: petitprince-11
-          port: eth0
-        12:
-          uid: petitprince-12
-          port: eth0
-        13:
-          uid: petitprince-13
-          port: eth0
-        14:
-          uid: petitprince-14
-          port: eth0
-        15:
-          uid: petitprince-15
-          port: eth0
-        16:
-          uid: petitprince-16
-          port: eth0
-        33:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/33
-          kind: switch
-        34:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/34
-          kind: switch
-        35:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/35
-          kind: switch
-        36:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/36
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Port-channel%CHANNELID%
-    "lacp5":
-        - linecard: 1
-          port: 33
-        - linecard: 1
-          port: 34
-        - linecard: 1
-          port: 35
-        - linecard: 1
-          port: 36
diff --git a/generators/input/sites/luxembourg/net-links/mxl2.yaml b/generators/input/sites/luxembourg/net-links/mxl2.yaml
deleted file mode 100644
index 6f69766a6f..0000000000
--- a/generators/input/sites/luxembourg/net-links/mxl2.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
----
-mxl2:
-  model: Force10 MXL
-  kind: switch
-  site: luxembourg
-  snmp_community: public
-  backplane_bps: 1407374880000
-  mtu: 1554
-  weathermap:
-    use_cacti: "yes"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.252
-  routes: {}
-
-  linecards:
-    0:
-      naming_pattern: "Te%LINECARD%/%PORT%"
-      snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      rate: 10000000000
-      kind: node
-      ports:
-        1:
-          uid: petitprince-1
-          port: eth1
-        2:
-          uid: petitprince-2
-          port: eth1
-        3:
-          uid: petitprince-3
-          port: eth1
-        4:
-          uid: petitprince-4
-          port: eth1
-        5:
-          uid: petitprince-5
-          port: eth1
-        6:
-          uid: petitprince-6
-          port: eth1
-        7:
-          uid: petitprince-7
-          port: eth1
-        8:
-          uid: petitprince-8
-          port: eth1
-        9:
-          uid: petitprince-9
-          port: eth1
-        10:
-          uid: petitprince-10
-          port: eth1
-        11:
-          uid: petitprince-11
-          port: eth1
-        12:
-          uid: petitprince-12
-          port: eth1
-        13:
-          uid: petitprince-13
-          port: eth1
-        14:
-          uid: petitprince-14
-          port: eth1
-        15:
-          uid: petitprince-15
-          port: eth1
-        16:
-          uid: petitprince-16
-          port: eth1
-        33:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/37
-          kind: switch
-        34:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/38
-          kind: switch
-        35:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/39
-          kind: switch
-        36:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/40
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Port-channel%CHANNELID%
-    "lacp6":
-        - linecard: 1
-          port: 33
-        - linecard: 1
-          port: 34
-        - linecard: 1
-          port: 35
-        - linecard: 1
-          port: 36
diff --git a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml b/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
deleted file mode 100644
index 194fc5b788..0000000000
--- a/generators/input/sites/luxembourg/net-links/ul-grid5000-sw02.yaml
+++ /dev/null
@@ -1,168 +0,0 @@
----
-ul-grid5000-sw02:
-  model: cisco N5K-C5020P-BF
-  kind: switch
-  site: luxembourg
-  snmp_community: public
-  backplane_bps: 1040000000000
-  mtu: 9216
-  weathermap:
-    use_cacti: "yes"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.253
-  routes: {}
-
-  linecards:
-#    0:
-#      naming_pattern: "mgmt%PORT%"
-#      rate: 100000000
-#      ports:
-#        0:
-#          uid: gw-luxembourg
-#          port: Gi1/46
-#          kind: router
-    1:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      kind: node
-      ports:
-        1:
-        2:
-          uid: granduc-1
-          port: eth2
-        3:
-          uid: granduc-2
-          port: eth2
-        4:
-          uid: granduc-3
-          port: eth2
-        5:
-          uid: granduc-4
-          port: eth2
-        6:
-          uid: granduc-5
-          port: eth2
-        7:
-          uid: granduc-6
-          port: eth2
-        8:
-          uid: granduc-7
-          port: eth2
-        9:
-          uid: granduc-8
-          port: eth2
-        10:
-          uid: granduc-9
-          port: eth2
-        11:
-          uid: granduc-10
-          port: eth2
-        12:
-          uid: granduc-11
-          port: eth2
-        13:
-          uid: granduc-12
-          port: eth2
-        14:
-          uid: granduc-13
-          port: eth2
-        15:
-          uid: granduc-14
-          port: eth2
-        16:
-          uid: granduc-15
-          port: eth2
-        17:
-          uid: granduc-16
-          port: eth2
-        18:
-          uid: granduc-17
-          port: eth2
-        19:
-          uid: granduc-18
-          port: eth2
-        20:
-          uid: granduc-19
-          port: eth2
-        21:
-          uid: granduc-20
-          port: eth2
-        22:
-          uid: granduc-21
-          port: eth2
-        23:
-          uid: granduc-22
-          port: eth2
-        24:
-        25:
-        26:
-        27:
-        28:
-        29:
-        30:
-          uid: gw-luxembourg
-          port: Te3/1
-          kind: router
-        31:
-        32:
-          uid: gw-luxembourg
-          port: Te3/2
-          kind: router
-        33:
-          uid: mxl1
-          port: Te0/33
-          kind: switch
-        34:
-          uid: mxl1
-          port: Te0/34
-          kind: switch
-        35:
-          uid: mxl1
-          port: Te0/35
-          kind: switch
-        36:
-          uid: mxl1
-          port: Te0/36
-          kind: switch
-        37:
-          uid: mxl2
-          port: Te0/33
-          kind: switch
-        38:
-          uid: mxl2
-          port: Te0/34
-          kind: switch
-        39:
-          uid: mxl2
-          port: Te0/35
-          kind: switch
-        40:
-          uid: mxl2
-          port: Te0/36
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: port-channel%CHANNELID%
-    "lacp5":
-        - linecard: 1
-          port: 33
-        - linecard: 1
-          port: 34
-        - linecard: 1
-          port: 35
-        - linecard: 1
-          port: 36
-    "lacp6":
-        - linecard: 1
-          port: 37
-        - linecard: 1
-          port: 38
-        - linecard: 1
-          port: 39
-        - linecard: 1
-          port: 40
diff --git a/generators/input/sites/luxembourg/pdus.rb b/generators/input/sites/luxembourg/pdus.rb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/generators/input/sites/lyon/clusters/hercule/hercule.rb b/generators/input/sites/lyon/clusters/hercule/hercule.rb
deleted file mode 100644
index 25a39c0b04..0000000000
--- a/generators/input/sites/lyon/clusters/hercule/hercule.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-site :lyon do |site_uid|
-
-  cluster :hercule do |cluster_uid|
-    model "Dell C6220"
-    created_at Time.parse("2012-10-02 12:00 GMT").httpdate
-    priority "201299"
-    kavlan true
-    queues ['default', 'admin']
-
-    4.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 10170000000,
-        :node_flops => 127100000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'rev'),
-          :storage   => 'HDD'
-        }]
-
-        network_adapters [        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => 10.G,
-          :device           => "eth0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => net_switch_lookup('lyon', 'hercule', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('lyon', 'hercule', node_uid, 'eth1'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 100.M,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :switch           => net_switch_lookup('lyon', 'hercule', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('lyon', 'hercule', node_uid, 'eth2'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 100.M,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :switch           => net_switch_lookup('lyon', 'hercule', node_uid, 'eth3'),
-          :switch_port      => net_port_lookup('lyon', 'hercule', node_uid, 'eth3'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :per_outlets => false,
-            :via => {
-              :api => { :metric => 'pdu_shared' },
-              :www => { :url => 'http://wattmetre.lyon.grid5000.fr/GetWatts-json.php' },
-            }
-          }
-        })
-      end
-    end
-  end # cluster hercule
-end
diff --git a/generators/input/sites/lyon/clusters/hercule/hercule_manual.yaml b/generators/input/sites/lyon/clusters/hercule/hercule_manual.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/generators/input/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
deleted file mode 100644
index 844f6874b3..0000000000
--- a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-hercule-1:
-  bios:
-    version: 1.0.21
-    release_date: 04/26/2012
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:8c:fa:0b:b9:c2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/24
-      rate: 10000000000
-      mac: 00:8c:fa:0b:b9:c3
-      ip6: fe80::28c:faff:fe0b:b9c3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.51.1
-    eth2:
-      mounted: false
-      mac: 84:8f:69:fd:4d:36
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 84:8f:69:fd:4d:37
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4d:38
-      ip: 172.17.51.1
-  block_devices:
-    sda:
-      model: WDC WD2003FYYS-1
-      device: sda
-      size: 2000398934016
-      rev: 1.0
-    sdb:
-      model: WDC WD2003FYYS-1
-      device: sdb
-      size: 2000398934016
-      rev: 1.0
-    sdc:
-      model: WDC WD2003FYYS-1
-      device: sdc
-      size: 2000398934016
-      rev: 1.0
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: JQ3HD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/generators/input/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
deleted file mode 100644
index cf50cb8f0a..0000000000
--- a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-hercule-2:
-  bios:
-    version: 1.0.21
-    release_date: 04/26/2012
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:8c:fa:0b:b4:bc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/25
-      rate: 10000000000
-      mac: 00:8c:fa:0b:b4:bd
-      ip6: fe80::28c:faff:fe0b:b4bd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.51.2
-    eth2:
-      mounted: false
-      mac: 84:8f:69:fd:4f:3d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 84:8f:69:fd:4f:3e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4f:3f
-      ip: 172.17.51.2
-  block_devices:
-    sda:
-      model: WDC WD2003FYYS-1
-      device: sda
-      size: 2000398934016
-      rev: 1.0
-    sdb:
-      model: WDC WD2003FYYS-1
-      device: sdb
-      size: 2000398934016
-      rev: 1.0
-    sdc:
-      model: WDC WD2003FYYS-1
-      device: sdc
-      size: 2000398934016
-      rev: 1.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: HQ3HD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/generators/input/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
deleted file mode 100644
index 8983dd062e..0000000000
--- a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-hercule-3:
-  bios:
-    version: 1.0.21
-    release_date: 04/26/2012
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: WDC WD2003FYYS-1
-      device: sda
-      size: 2000398934016
-      rev: 1.0
-    sdb:
-      model: WDC WD2003FYYS-1
-      device: sdb
-      size: 2000398934016
-      rev: 1.0
-    sdc:
-      model: WDC WD2003FYYS-1
-      device: sdc
-      size: 2000398934016
-      rev: 1.0
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:8c:fa:0b:e1:78
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/26
-      rate: 10000000000
-      mac: 00:8c:fa:0b:e1:79
-      ip6: fe80::28c:faff:fe0b:e179
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.51.3
-    eth2:
-      mounted: false
-      mac: 84:8f:69:fd:4c:1f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 84:8f:69:fd:4c:20
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4c:21
-      ip: 172.17.51.3
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: FQ3HD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/generators/input/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
deleted file mode 100644
index 723b6df073..0000000000
--- a/generators/input/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-hercule-4:
-  bios:
-    version: 1.0.21
-    release_date: 04/26/2012
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: WDC WD2003FYYS-1
-      device: sda
-      size: 2000398934016
-      rev: 1.0
-    sdb:
-      model: WDC WD2003FYYS-1
-      device: sdb
-      size: 2000398934016
-      rev: 1.0
-    sdc:
-      model: WDC WD2003FYYS-1
-      device: sdc
-      size: 2000398934016
-      rev: 1.0
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:8c:fa:0b:d8:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/27
-      rate: 10000000000
-      mac: 00:8c:fa:0b:d8:53
-      ip6: fe80::28c:faff:fe0b:d853
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.51.4
-    eth2:
-      mounted: false
-      mac: 84:8f:69:fd:4a:51
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
-      mounted: false
-      mac: 84:8f:69:fd:4a:52
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4a:53
-      ip: 172.17.51.4
-  chassis:
-    serial_number: GQ3HD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/orion/nodes/orion-1.yaml b/generators/input/sites/lyon/clusters/orion/nodes/orion-1.yaml
deleted file mode 100644
index 0c6819dace..0000000000
--- a/generators/input/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-orion-1:
-  bios:
-    version: 1.2.6
-    release_date: 05/10/2012
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/18
-      rate: 10000000000
-      mac: a0:36:9f:08:fa:54
-      ip6: fe80::a236:9fff:fe08:fa54
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.50.1
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:fa:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:25:9c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:25:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:25:9e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:25:9f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f3:bf:9e
-      ip: 172.17.50.1
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: B3MJD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/orion/nodes/orion-2.yaml b/generators/input/sites/lyon/clusters/orion/nodes/orion-2.yaml
deleted file mode 100644
index 82efa966f0..0000000000
--- a/generators/input/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-orion-2:
-  bios:
-    version: 1.2.6
-    release_date: 05/10/2012
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/19
-      rate: 10000000000
-      mac: a0:36:9f:08:f6:b8
-      ip6: fe80::a236:9fff:fe08:f6b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.50.2
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f6:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:23:58
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:23:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:23:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:23:5b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:28
-      ip: 172.17.50.2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 93MJD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/orion/nodes/orion-3.yaml b/generators/input/sites/lyon/clusters/orion/nodes/orion-3.yaml
deleted file mode 100644
index e7c93c627d..0000000000
--- a/generators/input/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-orion-3:
-  bios:
-    version: 1.2.6
-    release_date: 05/10/2012
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/20
-      rate: 10000000000
-      mac: a0:36:9f:08:fa:44
-      ip6: fe80::a236:9fff:fe08:fa44
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.50.3
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:fa:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:2c:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:2c:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:2c:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:2c:3f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:24
-      ip: 172.17.50.3
-  chassis:
-    serial_number: C3MJD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/orion/nodes/orion-4.yaml b/generators/input/sites/lyon/clusters/orion/nodes/orion-4.yaml
deleted file mode 100644
index 8f3c2b4c18..0000000000
--- a/generators/input/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-orion-4:
-  bios:
-    version: 1.2.6
-    release_date: 05/10/2012
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/21
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:c0
-      ip6: fe80::a236:9fff:fe08:f8c0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.50.4
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f8:c2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:25:5c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:25:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:25:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:25:5f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f5:ea:e2
-      ip: 172.17.50.4
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 83MJD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/orion/orion.rb b/generators/input/sites/lyon/clusters/orion/orion.rb
deleted file mode 100644
index 7ffbe4d2bc..0000000000
--- a/generators/input/sites/lyon/clusters/orion/orion.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-site :lyon do |site_uid|
-
-  cluster :orion do |cluster_uid|
-    model "Dell R720"
-    created_at Time.parse("2012-09-14 12:00 GMT").httpdate
-    priority "201299"
-    kavlan true
-    queues ['default', 'admin']
-
-    4.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 11900000000,
-          :node_flops => 147200000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel',
-          :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('lyon', 'orion', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('lyon', 'orion', node_uid, 'eth0'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :device           => "eth1",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :device           => "eth2",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :device           => "eth3",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :device           => "eth4",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :device           => "eth5",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :per_outlets => true,
-            :via => {
-            :pdu      => [{
-                :uid  => lookup('orion_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('orion_manual', node_uid, 'pdu', 'pdu_position'),
-             }],
-            :api => { :metric => 'power' },
-            :www => { :url => 'http://wattmetre.lyon.grid5000.fr/GetWatts-json.php' },
-            }
-          }
-        })
-        gpu({
-          :gpu         =>  true,
-          :gpu_count   =>  1,
-          :gpu_vendor  =>  "Nvidia",
-          :gpu_model   =>  "Tesla-M2075",
-        })
-
-      end
-    end
-  end # cluster orion
-end
diff --git a/generators/input/sites/lyon/clusters/orion/orion_manual.yaml b/generators/input/sites/lyon/clusters/orion/orion_manual.yaml
deleted file mode 100644
index 99f6568c91..0000000000
--- a/generators/input/sites/lyon/clusters/orion/orion_manual.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-orion-1:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 0
-orion-2:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 1
-orion-3:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 2
-orion-4:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 3
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
deleted file mode 100644
index a0b3bb804d..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-1:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:9e:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.101
-    eth1:
-      mounted: true
-      switch_port: "1:1"
-      rate: 1000000000
-      mac: 00:09:3d:12:9e:14
-      ip6: fe80::209:3dff:fe12:9e14
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.1
-    bmc:
-      mac: 00:09:3d:12:9e:15
-      ip: 172.17.49.1
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052536201
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
deleted file mode 100644
index e0e9d6f52d..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-10:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:aa:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.110
-    eth1:
-      mounted: true
-      switch_port: "1:10"
-      rate: 1000000000
-      mac: 00:09:3d:11:aa:e2
-      ip6: fe80::209:3dff:fe11:aae2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.10
-    bmc:
-      mac: 00:09:3d:11:aa:e3
-      ip: 172.17.49.10
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052075175
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
deleted file mode 100644
index 6d423fc703..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-11:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:9e:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.111
-    eth1:
-      mounted: true
-      switch_port: "1:11"
-      rate: 1000000000
-      mac: 00:09:3d:12:9e:07
-      ip6: fe80::209:3dff:fe12:9e07
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.11
-    bmc:
-      mac: 00:09:3d:12:9e:0f
-      ip: 172.17.49.11
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373307LC
-      device: sda
-      size: 73407868928
-      rev: 8
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052536163
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
deleted file mode 100644
index 665c3778f0..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-12:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3c:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.112
-    eth1:
-      mounted: true
-      switch_port: "1:12"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:2c
-      ip6: fe80::209:3dff:fe12:3c2c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.12
-    bmc:
-      mac: 00:09:3d:12:3c:2d
-      ip: 172.17.49.12
-  block_devices:
-    sda:
-      model: ST373307LC
-      device: sda
-      size: 73407868928
-      rev: 8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052423635
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
deleted file mode 100644
index 09df385aa4..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-13:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:91:60
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.113
-    eth1:
-      mounted: true
-      switch_port: "1:13"
-      rate: 1000000000
-      mac: 00:09:3d:12:91:61
-      ip6: fe80::209:3dff:fe12:9161
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.13
-    bmc:
-      mac: 00:09:3d:12:91:62
-      ip: 172.17.49.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052428994
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
deleted file mode 100644
index 15052ff808..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-14:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7a:bc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.114
-    eth1:
-      mounted: true
-      switch_port: "1:14"
-      rate: 1000000000
-      mac: 00:09:3d:12:7a:bd
-      ip6: fe80::209:3dff:fe12:7abd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.14
-    bmc:
-      mac: 00:09:3d:12:7a:be
-      ip: 172.17.49.14
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052080114
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
deleted file mode 100644
index d73948db13..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-15:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:28:70
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.115
-    eth1:
-      mounted: true
-      switch_port: "1:15"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:71
-      ip6: fe80::209:3dff:fe12:2871
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.15
-    bmc:
-      mac: 00:09:3d:12:28:72
-      ip: 172.17.49.15
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052422326
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
deleted file mode 100644
index d045686ba9..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-16:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7d:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.116
-    eth1:
-      mounted: true
-      switch_port: "1:16"
-      rate: 1000000000
-      mac: 00:09:3d:12:7d:07
-      ip6: fe80::209:3dff:fe12:7d07
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.16
-    bmc:
-      mac: 00:09:3d:12:7d:08
-      ip: 172.17.49.16
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052429007
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
deleted file mode 100644
index 449eeebf92..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-17:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:e7:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.117
-    eth1:
-      mounted: true
-      switch_port: "1:17"
-      rate: 1000000000
-      mac: 00:09:3d:11:e7:63
-      ip6: fe80::209:3dff:fe11:e763
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.17
-    bmc:
-      mac: 00:09:3d:11:e7:64
-      ip: 172.17.49.17
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052081146
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
deleted file mode 100644
index ddfcaf554a..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-18:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7e:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.118
-    eth1:
-      mounted: true
-      switch_port: "1:18"
-      rate: 1000000000
-      mac: 00:09:3d:12:7e:f2
-      ip6: fe80::209:3dff:fe12:7ef2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.18
-    bmc:
-      mac: 00:09:3d:12:7e:f3
-      ip: 172.17.49.18
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052429080
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
deleted file mode 100644
index d07643370f..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-19:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:90:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.119
-    eth1:
-      mounted: true
-      switch_port: "1:19"
-      rate: 1000000000
-      mac: 00:09:3d:12:90:57
-      ip6: fe80::209:3dff:fe12:9057
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.19
-    bmc:
-      mac: 00:09:3d:12:90:58
-      ip: 172.17.49.19
-  chassis:
-    serial_number: XG052428991
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
deleted file mode 100644
index 548f5fb835..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-2:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:65:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.102
-    eth1:
-      mounted: true
-      switch_port: "1:2"
-      rate: 1000000000
-      mac: 00:09:3d:12:65:7d
-      ip6: fe80::209:3dff:fe12:657d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.2
-    bmc:
-      mac: 00:09:3d:12:65:7e
-      ip: 172.17.49.2
-  chassis:
-    serial_number: XG052310079
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
deleted file mode 100644
index c29d23f469..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-20:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:90:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.120
-    eth1:
-      mounted: true
-      switch_port: "1:20"
-      rate: 1000000000
-      mac: 00:09:3d:12:90:84
-      ip6: fe80::209:3dff:fe12:9084
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.20
-    bmc:
-      mac: 00:09:3d:12:90:85
-      ip: 172.17.49.20
-  chassis:
-    serial_number: XG052428987
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
deleted file mode 100644
index cc295be581..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-21:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:85:70
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.121
-    eth1:
-      mounted: true
-      switch_port: "1:21"
-      rate: 1000000000
-      mac: 00:09:3d:12:85:71
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.21
-    bmc:
-      mac: 00:09:3d:12:85:72
-      ip: 172.17.49.21
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
deleted file mode 100644
index 9520978153..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-22:
-  bios:
-    version: V1.32.7.2
-    release_date: 03/02/2005
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:90:9e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.122
-    eth1:
-      mounted: true
-      switch_port: "1:22"
-      rate: 1000000000
-      mac: 00:09:3d:12:90:9f
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.22
-    bmc:
-      mac: 00:09:3d:12:90:a0
-      ip: 172.17.49.22
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052429001
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
deleted file mode 100644
index 1d667c5c70..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-23:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7d:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.123
-    eth1:
-      mounted: true
-      switch_port: "1:23"
-      rate: 1000000000
-      mac: 00:09:3d:12:7d:47
-      ip6: fe80::209:3dff:fe12:7d47
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.23
-    bmc:
-      mac: 00:09:3d:12:7d:48
-      ip: 172.17.49.23
-  chassis:
-    serial_number: XG052422799
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
deleted file mode 100644
index 09744ab161..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-24:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:50:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.124
-    eth1:
-      mounted: true
-      switch_port: "1:24"
-      rate: 1000000000
-      mac: 00:09:3d:12:50:86
-      ip6: fe80::209:3dff:fe12:5086
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.24
-    bmc:
-      mac: 00:09:3d:12:50:87
-      ip: 172.17.49.24
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052420563
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
deleted file mode 100644
index 5ebae56b05..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-25:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:10:de:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.125
-    eth1:
-      mounted: true
-      switch_port: "1:25"
-      rate: 1000000000
-      mac: 00:09:3d:10:de:8e
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.25
-    bmc:
-      mac: 00:09:3d:10:de:8f
-      ip: 172.17.49.25
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
deleted file mode 100644
index d658d64ecf..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-26:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:ce:21
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.126
-    eth1:
-      mounted: true
-      switch_port: "1:26"
-      rate: 1000000000
-      mac: 00:09:3d:11:ce:22
-      ip6: fe80::209:3dff:fe11:ce22
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.26
-    bmc:
-      mac: 00:09:3d:11:ce:23
-      ip: 172.17.49.26
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052083140
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
deleted file mode 100644
index 0405962183..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-27:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:6a:f0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.127
-    eth1:
-      mounted: true
-      switch_port: "1:27"
-      rate: 1000000000
-      mac: 00:09:3d:12:6a:f1
-      ip6: fe80::209:3dff:fe12:6af1
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.27
-    bmc:
-      mac: 00:09:3d:12:6a:f2
-      ip: 172.17.49.27
-  chassis:
-    serial_number: XG052310144
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
deleted file mode 100644
index 67182f0256..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-28:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:33:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.128
-    eth1:
-      mounted: true
-      switch_port: "1:28"
-      rate: 1000000000
-      mac: 00:09:3d:12:33:e6
-      ip6: fe80::209:3dff:fe12:33e6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.28
-    bmc:
-      mac: 00:09:3d:12:33:e7
-      ip: 172.17.49.28
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052422324
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
deleted file mode 100644
index c7a7c9cb23..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-29:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:e9:fe
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.129
-    eth1:
-      mounted: true
-      switch_port: "1:29"
-      rate: 1000000000
-      mac: 00:09:3d:11:e9:ff
-      ip6: fe80::209:3dff:fe11:e9ff
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.29
-    bmc:
-      mac: 00:09:3d:11:ea:00
-      ip: 172.17.49.29
-  chassis:
-    serial_number: XG052423610
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
deleted file mode 100644
index 376dcc8c1d..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-3:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:91:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.103
-    eth1:
-      mounted: true
-      switch_port: "1:3"
-      rate: 1000000000
-      mac: 00:09:3d:12:91:67
-      ip6: fe80::209:3dff:fe12:9167
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.3
-    bmc:
-      mac: 00:09:3d:12:91:68
-      ip: 172.17.49.3
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052428996
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
deleted file mode 100644
index 202f589088..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-30:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7c:93
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.130
-    eth1:
-      mounted: true
-      switch_port: "1:30"
-      rate: 1000000000
-      mac: 00:09:3d:12:7c:94
-      ip6: fe80::209:3dff:fe12:7c94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.30
-    bmc:
-      mac: 00:09:3d:12:7c:95
-      ip: 172.17.49.30
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052429073
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
deleted file mode 100644
index 9ed5bade8a..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-31:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:c9:0c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.131
-    eth1:
-      mounted: true
-      switch_port: "1:31"
-      rate: 1000000000
-      mac: 00:09:3d:12:c9:0e
-      ip6: fe80::209:3dff:fe12:c90e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.31
-    bmc:
-      mac: 00:09:3d:12:c9:0f
-      ip: 172.17.49.31
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG062972165
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
deleted file mode 100644
index 0f26779bfd..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-32:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:a5:74
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.132
-    eth1:
-      mounted: true
-      switch_port: "1:32"
-      rate: 1000000000
-      mac: 00:09:3d:12:a5:75
-      ip6: fe80::209:3dff:fe12:a575
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.32
-    bmc:
-      mac: 00:09:3d:12:a5:76
-      ip: 172.17.49.32
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052536375
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
deleted file mode 100644
index df3e5d259a..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-33:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:92:70
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.133
-    eth1:
-      mounted: true
-      switch_port: "1:33"
-      rate: 1000000000
-      mac: 00:09:3d:12:92:71
-      ip6: fe80::209:3dff:fe12:9271
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.33
-    bmc:
-      mac: 00:09:3d:12:92:72
-      ip: 172.17.49.33
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052536398
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
deleted file mode 100644
index c20f2020fc..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-34:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:a4:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.134
-    eth1:
-      mounted: true
-      switch_port: "1:34"
-      rate: 1000000000
-      mac: 00:09:3d:12:a4:ef
-      ip6: fe80::209:3dff:fe12:a4ef
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.34
-    bmc:
-      mac: 00:09:3d:12:a4:f0
-      ip: 172.17.49.34
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052536349
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
deleted file mode 100644
index b3dd3f0aa6..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-35:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:28:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.135
-    eth1:
-      mounted: true
-      switch_port: "1:35"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:17
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.35
-    bmc:
-      mac: 00:09:3d:12:28:18
-      ip: 172.17.49.35
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
deleted file mode 100644
index 81556280c0..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-36:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:10:c7:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.136
-    eth1:
-      mounted: true
-      switch_port: "1:36"
-      rate: 1000000000
-      mac: 00:09:3d:10:c7:bb
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.36
-    bmc:
-      mac: 00:09:3d:10:c7:bc
-      ip: 172.17.49.36
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
deleted file mode 100644
index 7a4813b093..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-37:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:69:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.137
-    eth1:
-      mounted: true
-      switch_port: "1:37"
-      rate: 1000000000
-      mac: 00:09:3d:12:69:f9
-      ip6: fe80::209:3dff:fe12:69f9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.37
-    bmc:
-      mac: 00:09:3d:12:69:fa
-      ip: 172.17.49.37
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052423605
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
deleted file mode 100644
index 54b4cc2c0b..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-38:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:38:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.138
-    eth1:
-      mounted: true
-      switch_port: "1:38"
-      rate: 1000000000
-      mac: 00:09:3d:12:38:6b
-      ip6: fe80::209:3dff:fe12:386b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.38
-    bmc:
-      mac: 00:09:3d:12:38:6c
-      ip: 172.17.49.38
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052423602
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
deleted file mode 100644
index 4c8a9f08af..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-39:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:4f:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.139
-    eth1:
-      mounted: true
-      switch_port: "1:39"
-      rate: 1000000000
-      mac: 00:09:3d:12:4f:19
-      ip6: fe80::209:3dff:fe12:4f19
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.39
-    bmc:
-      mac: 00:09:3d:12:4f:1a
-      ip: 172.17.49.39
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052420611
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
deleted file mode 100644
index c017be740a..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-4:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7e:bb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.104
-    eth1:
-      mounted: true
-      switch_port: "1:4"
-      rate: 1000000000
-      mac: 00:09:3d:12:7e:bc
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.4
-    bmc:
-      mac: 00:09:3d:12:7e:bd
-      ip: 172.17.49.4
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052428995
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
deleted file mode 100644
index e8dbbe0659..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-sagittaire-40:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:5a:30
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.140
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:11:5a:31
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.40
-    bmc:
-      mac: 00:09:3d:11:5a:32
-      ip: 172.17.49.40
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
deleted file mode 100644
index c54d06a9c9..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-41:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:6a:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.141
-    eth1:
-      mounted: true
-      switch_port: "1:41"
-      rate: 1000000000
-      mac: 00:09:3d:12:6a:42
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.41
-    bmc:
-      mac: 00:09:3d:12:6a:43
-      ip: 172.17.49.41
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
deleted file mode 100644
index e965bf57db..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-42:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:74:d4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.142
-    eth1:
-      mounted: true
-      switch_port: "1:42"
-      rate: 1000000000
-      mac: 00:09:3d:12:74:d5
-      ip6: fe80::209:3dff:fe12:74d5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.42
-    bmc:
-      mac: 00:09:3d:12:74:d6
-      ip: 172.17.49.42
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052420624
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
deleted file mode 100644
index 255882e66a..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-43:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:28:4f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.143
-    eth1:
-      mounted: true
-      switch_port: "1:43"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:50
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.43
-    bmc:
-      mac: 00:09:3d:12:28:51
-      ip: 172.17.49.43
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052422304
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
deleted file mode 100644
index c7f01f8ef3..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-44:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:a4:b4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.144
-    eth1:
-      mounted: true
-      switch_port: "1:44"
-      rate: 1000000000
-      mac: 00:09:3d:12:a4:b5
-      ip6: fe80::209:3dff:fe12:a4b5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.44
-    bmc:
-      mac: 00:09:3d:12:a4:b6
-      ip: 172.17.49.44
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052536146
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
deleted file mode 100644
index 65ac8f108f..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-45:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3c:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.145
-    eth1:
-      mounted: true
-      switch_port: "1:45"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:62
-      ip6: fe80::209:3dff:fe12:3c62
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.45
-    bmc:
-      mac: 00:09:3d:12:3c:63
-      ip: 172.17.49.45
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052420619
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
deleted file mode 100644
index adefde285c..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-46:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:9d:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.146
-    eth1:
-      mounted: true
-      switch_port: "1:46"
-      rate: 1000000000
-      mac: 00:09:3d:12:9d:e6
-      ip6: fe80::209:3dff:fe12:9de6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.46
-    bmc:
-      mac: 00:09:3d:12:9d:e7
-      ip: 172.17.49.46
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  chassis:
-    serial_number: XG052536197
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
deleted file mode 100644
index e7367550cd..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-47:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3c:03
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.147
-    eth1:
-      mounted: true
-      switch_port: "1:47"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:04
-      ip6: fe80::209:3dff:fe12:3c04
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.47
-    bmc:
-      mac: 00:09:3d:12:3c:05
-      ip: 172.17.49.47
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052423591
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
deleted file mode 100644
index 19d4b4c061..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-48:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:92:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.148
-    eth1:
-      mounted: true
-      switch_port: "1:48"
-      rate: 1000000000
-      mac: 00:09:3d:12:92:f6
-      ip6: fe80::209:3dff:fe12:92f6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.48
-    bmc:
-      mac: 00:09:3d:12:92:f7
-      ip: 172.17.49.48
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052536400
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
deleted file mode 100644
index 4a2eecad97..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-49:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3b:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.149
-    eth1:
-      mounted: true
-      switch_port: "2:1"
-      rate: 1000000000
-      mac: 00:09:3d:12:3b:de
-      ip6: fe80::209:3dff:fe12:3bde
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.49
-    bmc:
-      mac: 00:09:3d:12:3b:df
-      ip: 172.17.49.49
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  chassis:
-    serial_number: XG052420599
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
deleted file mode 100644
index cf84bbfa26..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-5:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3b:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.105
-    eth1:
-      mounted: true
-      switch_port: "1:5"
-      rate: 1000000000
-      mac: 00:09:3d:12:3b:7a
-      ip6: fe80::209:3dff:fe12:3b7a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.5
-    bmc:
-      mac: 00:09:3d:12:3b:7b
-      ip: 172.17.49.5
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052080174
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
deleted file mode 100644
index 5eeec18987..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-50:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:69:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.150
-    eth1:
-      mounted: true
-      switch_port: "2:2"
-      rate: 1000000000
-      mac: 00:09:3d:12:69:b8
-      ip6: fe80::209:3dff:fe12:69b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.50
-    bmc:
-      mac: 00:09:3d:12:69:b9
-      ip: 172.17.49.50
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052423649
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
deleted file mode 100644
index ff298f6fbb..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-51:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3c:70
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.151
-    eth1:
-      mounted: true
-      switch_port: "2:3"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:71
-      ip6: fe80::209:3dff:fe12:3c71
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.51
-    bmc:
-      mac: 00:09:3d:12:3c:72
-      ip: 172.17.49.51
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052420601
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
deleted file mode 100644
index ea84f81972..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-52:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:27:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.152
-    eth1:
-      mounted: true
-      switch_port: "2:4"
-      rate: 1000000000
-      mac: 00:09:3d:12:27:67
-      ip6: fe80::209:3dff:fe12:2767
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.52
-    bmc:
-      mac: 00:09:3d:12:27:68
-      ip: 172.17.49.52
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052422284
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
deleted file mode 100644
index 96bb0da779..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-53:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:9d:8b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.153
-    eth1:
-      mounted: true
-      switch_port: "2:5"
-      rate: 1000000000
-      mac: 00:09:3d:12:9d:8c
-      ip6: fe80::209:3dff:fe12:9d8c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.53
-    bmc:
-      mac: 00:09:3d:12:9d:8d
-      ip: 172.17.49.53
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  chassis:
-    serial_number: XG052536172
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
deleted file mode 100644
index 954ea9fb54..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-54:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:92:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.154
-    eth1:
-      mounted: true
-      switch_port: "2:6"
-      rate: 1000000000
-      mac: 00:09:3d:12:92:62
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.54
-    bmc:
-      mac: 00:09:3d:12:92:63
-      ip: 172.17.49.54
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052536363
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
deleted file mode 100644
index 86f11fae54..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-55:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:68:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.155
-    eth1:
-      mounted: true
-      switch_port: "2:7"
-      rate: 1000000000
-      mac: 00:09:3d:12:68:aa
-      ip6: fe80::209:3dff:fe12:68aa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.55
-    bmc:
-      mac: 00:09:3d:12:68:ab
-      ip: 172.17.49.55
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  chassis:
-    serial_number: XG052310093
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
deleted file mode 100644
index 1a6524100f..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-56:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:5a:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.156
-    eth1:
-      mounted: true
-      switch_port: "2:8"
-      rate: 1000000000
-      mac: 00:09:3d:12:5a:d7
-      ip6: fe80::209:3dff:fe12:5ad7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.56
-    bmc:
-      mac: 00:09:3d:12:5a:d8
-      ip: 172.17.49.56
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052291009
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
deleted file mode 100644
index bf5ddd912e..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-57:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:62:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.157
-    eth1:
-      mounted: true
-      switch_port: "2:9"
-      rate: 1000000000
-      mac: 00:09:3d:12:62:ef
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.57
-    bmc:
-      mac: 00:09:3d:12:62:f0
-      ip: 172.17.49.57
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052310153
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
deleted file mode 100644
index 5d5cc430b6..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-58:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:68:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.158
-    eth1:
-      mounted: true
-      switch_port: "2:10"
-      rate: 1000000000
-      mac: 00:09:3d:12:68:68
-      ip6: fe80::209:3dff:fe12:6868
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.58
-    bmc:
-      mac: 00:09:3d:12:68:69
-      ip: 172.17.49.58
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052310087
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
deleted file mode 100644
index 3f964c9f43..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-59:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:29:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.159
-    eth1:
-      mounted: true
-      switch_port: "2:11"
-      rate: 1000000000
-      mac: 00:09:3d:12:29:f9
-      ip6: fe80::209:3dff:fe12:29f9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.59
-    bmc:
-      mac: 00:09:3d:12:29:fa
-      ip: 172.17.49.59
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052081174
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
deleted file mode 100644
index 4ae0643dc2..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-6:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:3e:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.106
-    eth1:
-      mounted: true
-      switch_port: "1:6"
-      rate: 1000000000
-      mac: 00:09:3d:12:3e:eb
-      ip6: fe80::209:3dff:fe12:3eeb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.6
-    bmc:
-      mac: 00:09:3d:12:3e:ec
-      ip: 172.17.49.6
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052310124
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
deleted file mode 100644
index 0fbb5d8a22..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-60:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:6b:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.160
-    eth1:
-      mounted: true
-      switch_port: "2:12"
-      rate: 1000000000
-      mac: 00:09:3d:12:6b:3c
-      ip6: fe80::209:3dff:fe12:6b3c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.60
-    bmc:
-      mac: 00:09:3d:12:6b:3d
-      ip: 172.17.49.60
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  chassis:
-    serial_number: XG052310130
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
deleted file mode 100644
index 6291c2f753..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-61:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:5d:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.161
-    eth1:
-      mounted: true
-      switch_port: "2:13"
-      rate: 1000000000
-      mac: 00:09:3d:12:5d:fb
-      ip6: fe80::209:3dff:fe12:5dfb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.61
-    bmc:
-      mac: 00:09:3d:12:5d:fc
-      ip: 172.17.49.61
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052291007
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
deleted file mode 100644
index f1a35934d8..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-sagittaire-62:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:70:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.162
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:12:70:5b
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.62
-    bmc:
-      mac: 00:09:3d:12:70:5c
-      ip: 172.17.49.62
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
deleted file mode 100644
index bf7224924e..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-63:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:5e:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.163
-    eth1:
-      mounted: true
-      switch_port: "2:15"
-      rate: 1000000000
-      mac: 00:09:3d:12:5e:fc
-      ip6: fe80::209:3dff:fe12:5efc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.63
-    bmc:
-      mac: 00:09:3d:12:5e:fd
-      ip: 172.17.49.63
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052291036
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
deleted file mode 100644
index 468b2ebe1e..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-64:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:31:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.164
-    eth1:
-      mounted: true
-      switch_port: "2:16"
-      rate: 1000000000
-      mac: 00:09:3d:12:31:7d
-      ip6: fe80::209:3dff:fe12:317d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.64
-    bmc:
-      mac: 00:09:3d:12:31:7e
-      ip: 172.17.49.64
-  chassis:
-    serial_number: XG052291045
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
deleted file mode 100644
index 6de2264e81..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-65:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:28:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.165
-    eth1:
-      mounted: true
-      switch_port: "2:17"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:02
-      ip6: fe80::209:3dff:fe12:2802
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.65
-    bmc:
-      mac: 00:09:3d:12:28:03
-      ip: 172.17.49.65
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052422296
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
deleted file mode 100644
index 00b3d430ca..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-66:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:30:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.166
-    eth1:
-      mounted: true
-      switch_port: "2:18"
-      rate: 1000000000
-      mac: 00:09:3d:12:30:5f
-      ip6: fe80::209:3dff:fe12:305f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.66
-    bmc:
-      mac: 00:09:3d:12:30:60
-      ip: 172.17.49.66
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052420562
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
deleted file mode 100644
index 8dfa905deb..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-67:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:28:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.167
-    eth1:
-      mounted: true
-      switch_port: "2:19"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:aa
-      ip6: fe80::209:3dff:fe12:28aa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.67
-    bmc:
-      mac: 00:09:3d:12:28:ab
-      ip: 172.17.49.67
-  chassis:
-    serial_number: XG052422292
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
deleted file mode 100644
index 6dc22a8c34..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-68:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:27:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.168
-    eth1:
-      mounted: true
-      switch_port: "2:20"
-      rate: 1000000000
-      mac: 00:09:3d:12:27:f9
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.68
-    bmc:
-      mac: 00:09:3d:12:27:fa
-      ip: 172.17.49.68
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
deleted file mode 100644
index a61fc99409..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-69:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:40:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.169
-    eth1:
-      mounted: true
-      switch_port: "2:21"
-      rate: 1000000000
-      mac: 00:09:3d:12:40:a2
-      ip6: fe80::209:3dff:fe12:40a2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.69
-    bmc:
-      mac: 00:09:3d:12:40:a3
-      ip: 172.17.49.69
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052423581
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
deleted file mode 100644
index cf4ea316bb..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-7:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7f:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.107
-    eth1:
-      mounted: true
-      switch_port: "1:7"
-      rate: 1000000000
-      mac: 00:09:3d:12:7f:ea
-      ip6: fe80::209:3dff:fe12:7fea
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.7
-    bmc:
-      mac: 00:09:3d:12:7f:eb
-      ip: 172.17.49.7
-  chassis:
-    serial_number: XG052422741
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
deleted file mode 100644
index 5f37d2610a..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-sagittaire-70:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:ea:28
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.170
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:11:ea:29
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.70
-    bmc:
-      mac: 00:09:3d:11:ea:2a
-      ip: 172.17.49.70
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
deleted file mode 100644
index f7d8ed7ac2..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-71:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:db:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.171
-    eth1:
-      mounted: true
-      switch_port: "2:23"
-      rate: 1000000000
-      mac: 00:09:3d:11:db:b2
-      ip6: fe80::209:3dff:fe11:dbb2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.71
-    bmc:
-      mac: 00:09:3d:11:db:b3
-      ip: 172.17.49.71
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083258
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
deleted file mode 100644
index c7e526c32f..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-72:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:ae:fc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.172
-    eth1:
-      mounted: true
-      switch_port: "2:24"
-      rate: 1000000000
-      mac: 00:09:3d:11:ae:fd
-      ip6: fe80::209:3dff:fe11:aefd
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.72
-    bmc:
-      mac: 00:09:3d:11:ae:fe
-      ip: 172.17.49.72
-  chassis:
-    serial_number: XG052083198
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
deleted file mode 100644
index dc7aad8d21..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-73:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac:
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.173
-    eth1:
-      mounted: true
-      switch_port: "2:25"
-      rate: 1000000000
-      mac:
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.73
-    bmc:
-      mac:
-      ip: 172.17.49.73
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
deleted file mode 100644
index e543b26f19..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-74:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:db:ab
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.174
-    eth1:
-      mounted: true
-      switch_port: "2:26"
-      rate: 1000000000
-      mac: 00:09:3d:11:db:ac
-      ip6: fe80::209:3dff:fe11:dbac
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.74
-    bmc:
-      mac: 00:09:3d:11:db:ad
-      ip: 172.17.49.74
-  chassis:
-    serial_number: XG052083265
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
deleted file mode 100644
index c0872beeb7..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-75:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:95:21
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.175
-    eth1:
-      mounted: true
-      switch_port: "2:27"
-      rate: 1000000000
-      mac: 00:09:3d:11:95:22
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.75
-    bmc:
-      mac: 00:09:3d:11:95:23
-      ip: 172.17.49.75
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
deleted file mode 100644
index 4c94a11931..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-76:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:c5:1f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.176
-    eth1:
-      mounted: true
-      switch_port: "2:28"
-      rate: 1000000000
-      mac: 00:09:3d:11:c5:20
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.76
-    bmc:
-      mac: 00:09:3d:11:c5:21
-      ip: 172.17.49.76
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
deleted file mode 100644
index 9871ab3139..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-77:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104.0
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:c5:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.177
-    eth1:
-      mounted: true
-      switch_port: "2:29"
-      rate: 1000000000
-      mac: 00:09:3d:11:c5:2c
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.77
-    bmc:
-      mac: 00:09:3d:11:c5:2d
-      ip: 172.17.49.77
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG051642100
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
deleted file mode 100644
index 93043db898..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-78:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:12:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.178
-    eth1:
-      mounted: true
-      switch_port: "2:30"
-      rate: 1000000000
-      mac: 00:09:3d:11:12:2c
-      ip6: fe80::209:3dff:fe11:122c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.78
-    bmc:
-      mac: 00:09:3d:11:12:2d
-      ip: 172.17.49.78
-  chassis:
-    serial_number: XG052083164
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
deleted file mode 100644
index 1aea0bf89c..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-79:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:11:cd:8b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.179
-    eth1:
-      mounted: true
-      switch_port: "2:31"
-      rate: 1000000000
-      mac: 00:09:3d:11:cd:8c
-      ip6: fe80::209:3dff:fe11:cd8c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.79
-    bmc:
-      mac: 00:09:3d:11:cd:8d
-      ip: 172.17.49.79
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083120
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
deleted file mode 100644
index 8d7168d8d5..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-sagittaire-8:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:6b:0e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.108
-    eth1:
-      mounted: true
-      switch_port: "1:8"
-      rate: 1000000000
-      mac: 00:09:3d:12:6b:0f
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.8
-    bmc:
-      mac: 00:09:3d:12:6b:10
-      ip: 172.17.49.8
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial_number: XG052083161
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
deleted file mode 100644
index dc306794a7..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-sagittaire-9:
-  bios:
-    version: V1.35.2.2
-    release_date: 04/25/2006
-    vendor: Phoenix Technologies Ltd.
-  network_interfaces:
-    eth0:
-      mounted: false
-      mac: 00:09:3d:12:7f:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.109
-    eth1:
-      mounted: true
-      switch_port: "1:9"
-      rate: 1000000000
-      mac: 00:09:3d:12:7f:db
-      ip6: fe80::209:3dff:fe12:7fdb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: tg3
-      mountable: true
-      ip: 172.16.49.9
-    bmc:
-      mac: 00:09:3d:12:7f:dc
-      ip: 172.17.49.9
-  block_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: XG052422764
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/generators/input/sites/lyon/clusters/sagittaire/sagittaire.rb b/generators/input/sites/lyon/clusters/sagittaire/sagittaire.rb
deleted file mode 100644
index 14b8a7bbee..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/sagittaire.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-site :lyon do |site_uid|
-
-  cluster :sagittaire do |cluster_uid|
-    model "Sun Fire V20z"
-    created_at Time.parse("2006-07-01 12:00 GMT").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    79.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 3929000000,
-        :node_flops => 7440000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        if (i<69) then
-          storage_devices [{
-            :interface  => 'SCSI',
-            :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-            :driver     => "mptspi",
-            :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-            :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-            :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-            :storage    => 'HDD'
-          }]
-        else
-          storage_devices [{
-            :interface  => 'SCSI',
-            :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-            :driver     => "mptspi",
-            :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-            :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-            :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-            :storage    => 'HDD'
-          },
-          {
-            :interface  => 'SCSI',
-            :size       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'size'),
-            :driver     => "mptspi",
-            :device     => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'device'),
-            :model      => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'model'),
-            :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-            :storage    => 'HDD'
-          }]
-        end
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => false,
-          :device           => "eth0",
-          :vendor           => 'Broadcom',
-          :model            => 'BCM5704',
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => 'Broadcom',
-          :model            => 'BCM5704',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => net_switch_lookup('lyon', 'sagittaire', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('lyon', 'sagittaire', node_uid, 'eth1'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 1.G,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :driver           => "bnx2"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :per_outlets => true,
-            :via => {
-              :pdu      => [{
-                :uid  => lookup('sagittaire_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('sagittaire_manual', node_uid, 'pdu', 'pdu_position'),
-             }],
-              :api => { :metric => 'power' },
-              :www => { :url => 'http://wattmetre.lyon.grid5000.fr/GetWatts-json.php' },
-            }
-          }
-        })
-      end
-    end
-  end # cluster sagittaire
-end
diff --git a/generators/input/sites/lyon/clusters/sagittaire/sagittaire_manual.yaml b/generators/input/sites/lyon/clusters/sagittaire/sagittaire_manual.yaml
deleted file mode 100644
index 5db946531b..0000000000
--- a/generators/input/sites/lyon/clusters/sagittaire/sagittaire_manual.yaml
+++ /dev/null
@@ -1,317 +0,0 @@
----
-sagittaire-1:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 4
-sagittaire-10:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 5
-sagittaire-11:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 6
-sagittaire-12:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 7
-sagittaire-13:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 8
-sagittaire-14:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 9
-sagittaire-15:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 10
-sagittaire-16:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 11
-sagittaire-17:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 12
-sagittaire-18:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 13
-sagittaire-19:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 14
-sagittaire-2:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 15
-sagittaire-20:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 16
-sagittaire-21:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 17
-sagittaire-22:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 18
-sagittaire-23:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 19
-sagittaire-24:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 20
-sagittaire-25:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 21
-sagittaire-26:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 22
-sagittaire-27:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 23
-sagittaire-28:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 24
-sagittaire-29:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 25
-sagittaire-3:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 26
-sagittaire-30:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 27
-sagittaire-31:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 28
-sagittaire-32:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 29
-sagittaire-33:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 30
-sagittaire-34:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 31
-sagittaire-35:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 32
-sagittaire-36:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 33
-sagittaire-37:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 34
-sagittaire-38:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 35
-sagittaire-39:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 36
-sagittaire-4:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 37
-sagittaire-40:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 38
-sagittaire-41:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 39
-sagittaire-42:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 40
-sagittaire-43:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 41
-sagittaire-44:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 42
-sagittaire-45:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 43
-sagittaire-46:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 44
-sagittaire-47:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 45
-sagittaire-48:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 46
-sagittaire-49:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 47
-sagittaire-5:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 48
-sagittaire-50:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 49
-sagittaire-51:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 50
-sagittaire-52:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 51
-sagittaire-53:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 52
-sagittaire-54:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 53
-sagittaire-55:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 54
-sagittaire-56:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 55
-sagittaire-57:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 56
-sagittaire-58:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 57
-sagittaire-59:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 58
-sagittaire-6:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 59
-sagittaire-60:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 60
-sagittaire-61:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 61
-sagittaire-62:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 62
-sagittaire-63:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 63
-sagittaire-64:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 64
-sagittaire-65:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 65
-sagittaire-66:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 66
-sagittaire-67:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 67
-sagittaire-68:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 68
-sagittaire-69:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 69
-sagittaire-7:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 70
-sagittaire-70:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 71
-sagittaire-71:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 72
-sagittaire-72:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 73
-sagittaire-73:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 74
-sagittaire-74:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 75
-sagittaire-75:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 76
-sagittaire-76:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 77
-sagittaire-77:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 78
-sagittaire-78:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 79
-sagittaire-79:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 80
-sagittaire-8:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 81
-sagittaire-9:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 82
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
deleted file mode 100644
index 2a79ea6890..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-1:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/1
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:44
-      ip6: fe80::a236:9fff:fe09:c244
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.1
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:22:e8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:22:e9 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:22:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:22:eb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ec:f4
-      ip: 172.17.48.1
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 8HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
deleted file mode 100644
index a72c015e54..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-10:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/10
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:f0
-      ip6: fe80::a236:9fff:fe09:c2f0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.10
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ee:f6:90
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ee:f6:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ee:f6:92
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ee:f6:93
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:50:b2
-      ip: 172.17.48.10
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 4HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
deleted file mode 100644
index ea70e80ac5..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-11:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/11
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:30
-      ip6: fe80::a236:9fff:fe09:c230
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.11
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ee:ff:9c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ee:ff:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ee:ff:9e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ee:ff:9f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:4a:a4
-      ip: 172.17.48.11
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: JHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
deleted file mode 100644
index 01d02c983f..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-12:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/12
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:f4
-      ip6: fe80::a236:9fff:fe08:f8f4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.12
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f8:f6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:04:28
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:04:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:04:2a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:04:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ed:b8
-      ip: 172.17.48.12
-  chassis:
-    serial_number: GHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
deleted file mode 100644
index 8c6fec5ffd..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-13:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/13
-      rate: 10000000000
-      mac: a0:36:9f:08:f9:24
-      ip6: fe80::a236:9fff:fe08:f924
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.13
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f9:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:33:fc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:33:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:33:fe
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:33:ff
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ec:40
-      ip: 172.17.48.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: CHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
deleted file mode 100644
index 4b57745aed..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-14:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/14
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:4c
-      ip6: fe80::a236:9fff:fe08:f84c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.14
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f8:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:30:64
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:30:65
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:30:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:30:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:4c
-      ip: 172.17.48.14
-  chassis:
-    serial_number: DHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
deleted file mode 100644
index 348d1aea53..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-15:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/15
-      rate: 10000000000
-      mac: a0:36:9f:09:c1:58
-      ip6: fe80::a236:9fff:fe09:c158
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.15
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c1:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:22:10
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:22:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:22:12
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:22:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:6c
-      ip: 172.17.48.15
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 9HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
deleted file mode 100644
index fa690d95f5..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-16:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/16
-      rate: 10000000000
-      mac: a0:36:9f:08:f7:00
-      ip6: fe80::a236:9fff:fe08:f700
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.16
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f7:02
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:32:14
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:32:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:32:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:32:17
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:f1:54
-      ip: 172.17.48.16
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: BHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
deleted file mode 100644
index c5e3b2ef0b..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-2:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/2
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:60
-      ip6: fe80::a236:9fff:fe09:c260
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.2
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:21:bc 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:21:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:21:be 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:21:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:ea
-      ip: 172.17.48.2
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: 6HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
deleted file mode 100644
index 8d810896c8..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-3:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/3
-      rate: 10000000000
-      mac: a0:36:9f:09:c3:f8
-      ip6: fe80::a236:9fff:fe09:c3f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.3
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c3:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:31:38
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:31:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:31:3a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:31:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ed:04
-      ip: 172.17.48.3
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 7HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
deleted file mode 100644
index fdf8699c01..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-4:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/4
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:6c
-      ip6: fe80::a236:9fff:fe08:f86c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.4
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f8:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:23:2c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:23:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:23:2e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:23:2f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:e7:96
-      ip: 172.17.48.4
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: FHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
deleted file mode 100644
index 744944361b..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-5:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/5
-      rate: 10000000000
-      mac: a0:36:9f:09:c3:24
-      ip6: fe80::a236:9fff:fe09:c324
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.5
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c3:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:22:80
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:22:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:22:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:22:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ed:38
-      ip: 172.17.48.5
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 5HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
deleted file mode 100644
index e60eaa5ed1..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-6:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/6
-      rate: 10000000000
-      mac: a0:36:9f:08:fb:08
-      ip6: fe80::a236:9fff:fe08:fb08
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.6
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:fb:0a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:00:b4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:00:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:00:b6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:00:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ed:fe
-      ip: 172.17.48.6
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: HHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
deleted file mode 100644
index 772713b38b..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-7:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/7
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:f8
-      ip6: fe80::a236:9fff:fe09:c2f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.7
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:31:34
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:31:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:31:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:31:37
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ef:c8
-      ip: 172.17.48.7
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: 2HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
deleted file mode 100644
index ca7686f35d..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-8:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/8
-      rate: 10000000000
-      mac: a0:36:9f:09:c0:14
-      ip6: fe80::a236:9fff:fe09:c2f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.8
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c0:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ef:22:b8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ef:22:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ef:22:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ef:22:bb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fa:78:88
-      ip: 172.17.48.8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: 3HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/generators/input/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
deleted file mode 100644
index 342b729f9d..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-taurus-9:
-  bios:
-    version: 2.5
-    release_date: 01/22/2016
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/9
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:48
-      ip6: fe80::a236:9fff:fe08:f848
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: ixgbe
-      mountable: true
-      ip: 172.16.48.9
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f8:4a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
-      mounted: false
-      mac: bc:30:5b:ee:fd:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: bc:30:5b:ee:fd:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
-      mounted: false
-      mac: bc:30:5b:ee:fd:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
-      mounted: false
-      mac: bc:30:5b:ee:fd:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:50:78
-      ip: 172.17.48.9
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  chassis:
-    serial_number: 1JTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/generators/input/sites/lyon/clusters/taurus/taurus.rb b/generators/input/sites/lyon/clusters/taurus/taurus.rb
deleted file mode 100644
index e811eb130d..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/taurus.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-site :lyon do |site_uid|
-
-  cluster :taurus do |cluster_uid|
-    model "Dell R720"
-    created_at Time.parse("2012-09-14 12:00 GMT").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    16.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 11770000000,
-        :node_flops => 146900000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel',
-          :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('lyon', 'taurus', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('lyon', 'taurus', node_uid, 'eth0'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :device           => "eth1",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel X520 DP 10Gb DA/SFP+ Server Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :device           => "eth2",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :device           => "eth3",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :device           => "eth4",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :device           => "eth5",
-          :bridged          => false,
-          :vendor           => 'Intel',
-          :model            => 'Intel Ethernet I350 QP 1Gb',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :per_outlets => true,
-            :via => {
-              :pdu      => [{
-                :uid  => lookup('taurus_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('taurus_manual', node_uid, 'pdu', 'pdu_position'),
-             }],
-              :api => { :metric => 'power' },
-              :www => { :url => 'http://wattmetre.lyon.grid5000.fr/GetWatts-json.php' },
-            }
-          }
-        })
-
-      end
-    end
-  end # cluster taurus
-end
diff --git a/generators/input/sites/lyon/clusters/taurus/taurus_manual.yaml b/generators/input/sites/lyon/clusters/taurus/taurus_manual.yaml
deleted file mode 100644
index 4aa0936b10..0000000000
--- a/generators/input/sites/lyon/clusters/taurus/taurus_manual.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-taurus-1:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 83
-taurus-10:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 84
-taurus-11:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 85
-taurus-12:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 86
-taurus-13:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 87
-taurus-14:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 88
-taurus-15:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 89
-taurus-16:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 90
-taurus-2:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 91
-taurus-3:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 92
-taurus-4:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 93
-taurus-5:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 94
-taurus-6:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 95
-taurus-7:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 96
-taurus-8:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 97
-taurus-9:
-  pdu:
-    pdu_name: wattmetre
-    pdu_position: 98
diff --git a/generators/input/sites/lyon/lyon.rb b/generators/input/sites/lyon/lyon.rb
deleted file mode 100644
index f4a6891c5a..0000000000
--- a/generators/input/sites/lyon/lyon.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :lyon do |site_uid|
-  name "Lyon"
-  location "Lyon, France"
-  web "https://www.grid5000.fr/mediawiki/index.php/Lyon:Home"
-  description "Lyon Grid'5000 Site"
-  latitude 45.7667
-  longitude 4.8333
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.12.0.0/14"
-  virt_ip_range "10.140.0.0/14"
-  storage5k true
-  production true
-
-  g5ksubnet({
-    :network => '10.140.0.0/14',
-    :gateway => '10.143.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.48.0/20',
-      :gateway => '172.16.63.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.63.122'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.63.123'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.63.124'
-    },
-    '4' => {
-      :network => '10.12.0.0/18',
-      :gateway => '10.12.63.254'
-    },
-    '5' => {
-      :network => '10.12.64.0/18',
-      :gateway => '10.12.127.254'
-    },
-    '6' => {
-      :network => '10.12.128.0/18',
-      :gateway => '10.12.191.254'
-    },
-    '7' => {
-      :network => '10.12.192.0/18',
-      :gateway => '10.12.255.254'
-    },
-    '8' => {
-      :network => '10.13.0.0/18',
-      :gateway => '10.13.63.254'
-    },
-    '9' => {
-      :network => '10.13.64.0/18',
-      :gateway => '10.13.127.254'
-    },
-    '13' => {
-      :network => '10.15.192.0/18',
-      :gateway => '10.15.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/lyon/net-links/force10.yaml b/generators/input/sites/lyon/net-links/force10.yaml
deleted file mode 100644
index b1fac59734..0000000000
--- a/generators/input/sites/lyon/net-links/force10.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-force10:
-  model: Force10 S4810
-  kind: switch
-  site: lyon
-  snmp_community: public
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.63.253
-  routes: {}
-  backplane_bps: 1280000000000
-  mtu: 12000
-  linecards:
-    0:
-      naming_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      kind: node
-      rate: 10000000000
-      port: eth0
-      ports:
-        1: taurus-1
-        2: taurus-2
-        3: taurus-3
-        4: taurus-4
-        5: taurus-5
-        6: taurus-6
-        7: taurus-7
-        8: taurus-8
-        9: taurus-9
-        10: taurus-10
-        11: taurus-11
-        12: taurus-12
-        13: taurus-13
-        14: taurus-14
-        15: taurus-15
-        16: taurus-16
-        18: orion-1
-        19: orion-2
-        20: orion-3
-        21: orion-4
-        24:
-          uid: hercule-1
-          port: eth1
-        25:
-          uid: hercule-2
-          port: eth1
-        26:
-          uid: hercule-3
-          port: eth1
-        27:
-          uid: hercule-4
-          port: eth1
-        36:
-          uid: castor
-          kind: other
-        37:
-          uid: pollux
-          kind: other
-        42:
-          uid: gw-lyon
-          kind: router
-          port: "9:2"
-        47:
-          uid: pat
-          port: "1:25"
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/lyon/net-links/gw-lyon.yaml b/generators/input/sites/lyon/net-links/gw-lyon.yaml
deleted file mode 100644
index 3740939217..0000000000
--- a/generators/input/sites/lyon/net-links/gw-lyon.yaml
+++ /dev/null
@@ -1,200 +0,0 @@
----
-gw-lyon:
-  model: Extreme Networks version 12.1.3.14
-  kind: router
-  site: lyon
-  snmp_community: public
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.63.254
-    "vlan101":
-      addresses:
-        - 172.17.63.254
-    "vlan500":
-      addresses:
-        - 192.168.4.13
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.12.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.12.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.12.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.12.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.13.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.13.64.0/18
-    "vlan713":
-      name: kavlan-13
-      addresses:
-        - 10.15.192.0/18
-  routes: {}
-  backplane_bps: 800000000000
-  mtu: 9216
-  linecards:
-    2:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000,
-      kind: node
-      rate: 1000000000
-      port: eth1
-      ports:
-        1: sagittaire-49
-        2: sagittaire-50
-        3: sagittaire-51
-        4: sagittaire-52
-        5: sagittaire-53
-        6: sagittaire-54
-        7: sagittaire-55
-        8: sagittaire-56
-        9: sagittaire-57
-        10: sagittaire-58
-        11: sagittaire-59
-        12: sagittaire-60
-        13: sagittaire-61
-        15: sagittaire-63
-        16: sagittaire-64
-        17: sagittaire-65
-        18: sagittaire-66
-        19: sagittaire-67
-        20: sagittaire-68
-        21: sagittaire-69
-        23: sagittaire-71
-        24: sagittaire-72
-        25: sagittaire-73
-        26: sagittaire-74
-        27: sagittaire-75
-        28: sagittaire-76
-        29: sagittaire-77
-        30: sagittaire-78
-        31: sagittaire-79
-        34: cyrrus-adm
-    3:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000,
-      kind: node
-      rate: 1000000000
-      port: eth1
-      ports:
-        10: sagittaire-10
-        11: sagittaire-11
-        12: sagittaire-12
-        13: sagittaire-13
-        14: sagittaire-14
-        15: sagittaire-15
-        16: sagittaire-16
-        17: sagittaire-17
-        18: sagittaire-18
-        19: sagittaire-19
-        1: sagittaire-1
-        20: sagittaire-20
-        21: sagittaire-21
-        22: sagittaire-22
-        23: sagittaire-23
-        24: sagittaire-24
-        25: sagittaire-25
-        26: sagittaire-26
-        27: sagittaire-27
-        28: sagittaire-28
-        29: sagittaire-29
-        2: sagittaire-2
-        30: sagittaire-30
-        31: sagittaire-31
-        32: sagittaire-32
-        33: sagittaire-33
-        34: sagittaire-34
-        35: sagittaire-35
-        36: sagittaire-36
-        37: sagittaire-37
-        38: sagittaire-38
-        39: sagittaire-39
-        3: sagittaire-3
-        41: sagittaire-41
-        42: sagittaire-42
-        43: sagittaire-43
-        44: sagittaire-44
-        45: sagittaire-45
-        46: sagittaire-46
-        47: sagittaire-47
-        48: sagittaire-48
-        4: sagittaire-4
-        5: sagittaire-5
-        6: sagittaire-6
-        7: sagittaire-7
-        8: sagittaire-8
-        9: sagittaire-9
-    4:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000,
-      kind: switch
-      rate: 1000000000
-      ports:
-        6:
-          uid: cyrrus
-          port: eth1
-          kind: other
-        7:
-          uid: flow
-          port: eth1
-          kind: other
-        21:
-          uid: nebula
-          port: eth1
-          kind: other
-        36:
-          uid: wattmetre
-          port: eth1
-          kind: other
-        48:
-          uid: ENS-Lyon
-          kind: virtual # Through castor, nat VM to ENS-Lyon network
-    9:
-      naming_pattern: "%LINECARD%:%PORT%"
-      snmp_pattern: "BD-8810 Port %LINECARD%:%PORT%"
-      backplane_bps: 48000000000,
-      kind: switch
-      rate: 10000000000
-      ports:
-        2:
-          uid: force10
-          port: "0:42"
-        3:
-          uid: salome
-          port: "0:49"
-        4:
-          uid: renater-lyon
-          site: renater
-          kind: virtual
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/lyon/net-links/pat.yaml b/generators/input/sites/lyon/net-links/pat.yaml
deleted file mode 100644
index 272928fdfc..0000000000
--- a/generators/input/sites/lyon/net-links/pat.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-pat:
-  model: Foundry EdgeIron
-  kind: switch
-  site: lyon
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  mtu: 1500
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.17.63.250
-  routes: {}
-  backplane_bps: 40000000000
-
-  linecards:
-    1:
-      naming_pattern: "%LINECARD%/%PORT%"
-      snmp_pattern: "EtherNet Port on unit %LINECARD%, port:%PORT%"
-      kind: node
-      rate: 100000000
-      ports:
-        1:
-          uid: hercule-1
-          port: eth2
-        2:
-          uid: hercule-2
-          port: eth2
-        3:
-          uid: hercule-3
-          port: eth2
-        4:
-          uid: hercule-4
-          port: eth2
-        21:
-          uid: hercule-1
-          port: eth3
-        22:
-          uid: hercule-2
-          port: eth3
-        23:
-          uid: hercule-3
-          port: eth3
-        24:
-          uid: hercule-4
-          port: eth3
-        25: 
-          uid: force10
-          port: "0:47"
-          kind: switch
-        26:
-          uid: chris
-          port: "0:37"
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/lyon/net-links/salome.yaml b/generators/input/sites/lyon/net-links/salome.yaml
deleted file mode 100644
index 36ed26e11f..0000000000
--- a/generators/input/sites/lyon/net-links/salome.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-salome:
-  model: Foundry FES-X 448
-  kind: switch
-  site: lyon
-  snmp_community: public
-  mtu: 10240
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.63.252
-  routes: {}
-  backplane_bps: 136000000000,
-  linecards:
-    0:
-      naming_pattern: "ethernet%PORT%"
-      snmp_pattern: "GigabitEthernet%PORT%"
-      kind: router
-      rate: 1000000000
-      ports:
-        49:
-            uid: gw-lyon
-            snmp_pattern: "GigabitEthernet%PORT%"
-            rate: 10000000000
-        48:
-            uid: mizar
-            port: eth0
-            kind: other
-  channels:
-    naming_pattern: Po%CHANNELID%
-
diff --git a/generators/input/sites/lyon/pdus.rb b/generators/input/sites/lyon/pdus.rb
deleted file mode 100644
index 0c967ddbfe..0000000000
--- a/generators/input/sites/lyon/pdus.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-site :lyon do |site_uid|
-  pdu "wattmetre" do |pdu_uid|
-    vendor "OmegaWatt"
-    model ""
-    sensors [
-      {
-        :power => {
-          :per_outlets => true,
-          :wattmetre => {
-            :available => true,
-            :www => { :url => 'http://wattmetre.lyon.grid5000.fr/GetWatts-json.php' },
-            :unit => "W",
-          }
-        }
-      }
-    ]
-  end
-end
diff --git a/generators/input/sites/nancy/clusters/graoully/graoully.rb b/generators/input/sites/nancy/clusters/graoully/graoully.rb
deleted file mode 100644
index 4aa3d39c4b..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/graoully.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :graoully do |cluster_uid|
-    model "Dell PowerEdge R630"
-    created_at Time.parse("2016-01-04").httpdate
-    kavlan true
-    queues ['admin', 'production']
-
-    16.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 0.G,
-        :node_flops => 0.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :max_walltime => (31536000 if i >= 12) || (172800 if i >= 9) || (86400 if i >= 6) || (7200 if i >= 3) || (3600 if i >= 0),
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['admin', 'production']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
-          :release  => "Jessie",
-          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
-          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'graoully', node_uid),
-          :switch_port      => net_port_lookup('nancy', 'graoully', node_uid),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr"
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :bridged          => false,
-          :device           => "eth4",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :bridged          => false,
-          :device           => "eth5",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => true,
-          :mounted          => true,
-          :bridged          => false,
-          :device           => "ib0",
-          :vendor           => 'Mellanox',
-          :model            => 'MT27500 Family [ConnectX-3]',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mac'),
-          :ip               => "172.18.70.#{i+1}",
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :hwid             => lookup('graoully_manual', node_uid, 'network_interfaces', 'ib0', 'hwid'),
-          :switch           => "sgraoullyib",
-          :ib_switch_card   => lookup('graoully_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-          :ib_switch_card_pos => lookup('graoully_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => "172.17.70.#{i+1}",
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => { 
-              :api => { :metric => 'power' },
-              :pdu => [ {
-                :uid => lookup('graoully_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('graoully_manual', node_uid, 'pdu', 'pdu_position'),
-              } ]
-            }
-          }
-        })
-
-      end
-    end
-  end # cluster graoully
-end # nancy
diff --git a/generators/input/sites/nancy/clusters/graoully/graoully_manual.yaml b/generators/input/sites/nancy/clusters/graoully/graoully_manual.yaml
deleted file mode 100644
index ca8c3e298d..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/graoully_manual.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-graoully-1:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 11
-graoully-2:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 11
-graoully-3:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 12
-graoully-4:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 14
-graoully-5:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 13
-graoully-6:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 13
-graoully-7:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 10
-graoully-8:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 10
-graoully-9:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 14
-graoully-10:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 12
-graoully-11:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 20
-graoully-12:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 19
-graoully-13:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 19
-graoully-14:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 20
-graoully-15:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 21
-graoully-16:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 21
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
deleted file mode 100644
index b14546d325..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-1:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3DYYH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1307
-      timewrite: 2926
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:0c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.1
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:0d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:0a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:c0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:c2
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:41
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
deleted file mode 100644
index 43378deb76..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-10:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3Z93J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1257
-      timewrite: 2891
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:fc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.10
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:fd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:fa
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:ac
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:ae
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:a1
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
deleted file mode 100644
index c19824c157..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-11:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3ZBZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1265
-      timewrite: 2967
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.11
-      driver: ixgbe
-      mac: 24:6e:96:03:1f:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:9c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:9d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:1f:9a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:39:64
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:39:66
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:51
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
deleted file mode 100644
index 7d7223f5a4..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-12:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3DW1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1269
-      timewrite: 2906
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:9c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.12
-      driver: ixgbe
-      mac: 24:6e:96:03:09:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:9d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:09:9a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:30
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:32
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:71
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
deleted file mode 100644
index db18f7a802..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-13:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3DV0J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1274
-      timewrite: 2902
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.13
-      driver: ixgbe
-      mac: 24:6e:96:03:24:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:0c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:0d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:24:0a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:00
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:02
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:51:c1
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
deleted file mode 100644
index a277a28428..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-14:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3F32J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1286
-      timewrite: 2942
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.14
-      driver: ixgbe
-      mac: 24:6e:96:03:12:d8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:12:dc
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:12:dd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:12:da
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:28
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:2a
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:91
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
deleted file mode 100644
index d16470ae80..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-15:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3DX1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1269
-      timewrite: 2889
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:fc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.15
-      driver: ixgbe
-      mac: 24:6e:96:03:09:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:fd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:09:fa
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:d8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:da
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:71
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
deleted file mode 100644
index 993cad6271..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-16:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3F4ZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1291
-      timewrite: 2935
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:54
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.16
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:50
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:55
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:52
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:d4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:d6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:81
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
deleted file mode 100644
index 7c9c0c6ccc..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-2:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3DY1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1298
-      timewrite: 2960
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:2c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.2
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:28
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:2d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:2a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:f0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:f2
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:61
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
deleted file mode 100644
index 8b281ef852..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-3:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3F03J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1282
-      timewrite: 2916
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:0c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.3
-      driver: ixgbe
-      mac: 24:6e:96:03:11:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:0d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:0a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:d4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:d6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:61
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
deleted file mode 100644
index 074eca88c3..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-4:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3DZ3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1267
-      timewrite: 2933
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:5c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.4
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:58
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:5d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:5a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:ec
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:ee
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:b1
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
deleted file mode 100644
index b3e4c41bd4..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-5:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3ZD3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1282
-      timewrite: 2919
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:94
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.5
-      driver: ixgbe
-      mac: 24:6e:96:03:1f:90
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:95
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:1f:92
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:b4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:b6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:c1
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
deleted file mode 100644
index fa390350d2..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-6:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3ZG1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1281
-      timewrite: 2951
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:24
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.6
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:20
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:25
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:22
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:9c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:9e
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:2e:01
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
deleted file mode 100644
index d8392860af..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-7:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3ZF3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1295
-      timewrite: 3022
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1e:0c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.7
-      driver: ixgbe
-      mac: 24:6e:96:03:1e:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1e:0d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:1e:0a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:38:60
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:38:62
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:2c:b1
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
deleted file mode 100644
index 37e355727e..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-8:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3ZH0J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1313
-      timewrite: 2960
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.8
-      driver: ixgbe
-      mac: 24:6e:96:03:12:70
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:12:74
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:12:75
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:12:72
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:37:98
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:37:9a
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:30:b1
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/generators/input/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
deleted file mode 100644
index 0c13b53b99..0000000000
--- a/generators/input/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graoully-9:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3ZG4J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1265
-      timewrite: 2862
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.70.9
-      driver: ixgbe
-      mac: 24:6e:96:03:1e:d0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1e:d4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1e:d5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:1e:d2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:35:ac
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:35:ae
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:31:11
-      rate: 56000000000
-      version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graphene/graphene.rb b/generators/input/sites/nancy/clusters/graphene/graphene.rb
deleted file mode 100644
index 8e1782167a..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/graphene.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :graphene do |cluster_uid|
-    model "Carri System 5393"
-    created_at Time.parse("2011-01-20").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    144.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 8.024.G,
-          :node_flops => 31.01.G
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA II',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => "intel",
-          :version          => "82574L",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('nancy', 'graphene', node_uid),
-          :switch_port      => net_port_lookup('nancy', 'graphene', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "intel",
-          :version          => "82574L",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "intel",
-          :version          => "82574L",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT26418",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :switch           => "sgrapheneib",
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-          :device           => "ib1",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT26418",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "Tyan",
-          :version => "AST2050",
-          :device => "bmc",
-          :ip => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :switch => lookup('graphene_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-          :switch_port => lookup('graphene_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port')
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        if (105<=i+1 and i+1<=144) then
-          sensors({
-            :power => {
-              :available => true,
-              :via => {
-                :api => { :metric => 'power' },
-                :pdu => [ {
-                  :uid  => lookup('graphene_manual', node_uid, 'pdu', 'pdu_name'),
-                  :port => lookup('graphene_manual', node_uid, 'pdu', 'pdu_position'),
-                } ]
-              }
-            }
-          })
-        else
-          sensors({
-            :power => {
-              :available => true, # Set to true when pdu resources will be declared
-              :via => {
-                :api => { :metric => 'power' },
-                :pdu => [ { :uid  => lookup('graphene_manual', node_uid, 'pdu', 'pdu_name') } ]
-              }
-            }
-          })
-        end
-
-      end
-    end
-  end # cluster graphene
-end
diff --git a/generators/input/sites/nancy/clusters/graphene/graphene_manual.yaml b/generators/input/sites/nancy/clusters/graphene/graphene_manual.yaml
deleted file mode 100644
index c5714d83a7..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/graphene_manual.yaml
+++ /dev/null
@@ -1,1873 +0,0 @@
----
-graphene-1:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/2
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 2
-graphene-2:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/1
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 3
-graphene-3:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/4
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 4
-graphene-4:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/3
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 5
-graphene-5:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/6
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 1
-graphene-6:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/5
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 2
-graphene-7:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/8
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 3
-graphene-8:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/12
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 4
-graphene-9:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/11
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 5
-graphene-10:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/7
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 6
-graphene-11:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/10
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/35
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 7
-graphene-12:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/9
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/36
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 9
-graphene-13:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/14
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/37
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 10
-graphene-14:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/13
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/38
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 11
-graphene-15:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/16
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/39
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 12
-graphene-16:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/15
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/40
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 13
-graphene-17:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/18
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/41
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 14
-graphene-18:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/17
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/42
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 15
-graphene-19:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/20
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/43
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 9
-graphene-20:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/19
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/44
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 10
-graphene-21:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/22
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/1
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 11
-graphene-22:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/21
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/2
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 12
-graphene-23:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/24
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/3
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 13
-graphene-24:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/23
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 14
-graphene-25:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/26
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 15
-graphene-26:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/25
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 17
-graphene-27:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/28
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/7
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 18
-graphene-28:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/27
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 19
-graphene-29:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/30
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 20
-graphene-30:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/29
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/10
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 21
-graphene-31:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/32
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/11
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 22
-graphene-32:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/31
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/12
-  pdu:
-    pdu_name: graphene-pdu1
-    pdu_position: 23
-graphene-33:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/34
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/13
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 17
-graphene-34:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/33
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/14
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 18
-graphene-35:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/36
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/15
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 19
-graphene-36:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/35
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/16
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 20
-graphene-37:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/38
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/17
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 21
-graphene-38:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/37
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/18
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 22
-graphene-39:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene1
-      switch_port: Gi1/0/40
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene1-ipmi
-      switch_port: 1/0/19
-  pdu:
-    pdu_name: graphene-pdu2
-    pdu_position: 23
-graphene-40:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/1
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 3
-graphene-41:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/2
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 4
-graphene-42:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/3
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 5
-graphene-43:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/4
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 1
-graphene-44:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/5
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 2
-graphene-45:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/6
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 3
-graphene-46:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/7
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 4
-graphene-47:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/8
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 9
-graphene-48:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/9
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 10
-graphene-49:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/10
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 11
-graphene-50:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/11
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/35
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 12
-graphene-51:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/12
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/36
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 13
-graphene-52:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/13
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/37
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 14
-graphene-53:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/14
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/38
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 15
-graphene-54:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/15
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/39
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 5
-graphene-55:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/16
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/40
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 6
-graphene-56:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/17
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/1
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 11
-graphene-57:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/18
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/2
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 12
-graphene-58:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/19
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/3
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 13
-graphene-59:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/20
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 14
-graphene-60:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/21
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 15
-graphene-61:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/22
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 17
-graphene-62:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/23
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/7
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 18
-graphene-63:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/24
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 19
-graphene-64:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/25
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 20
-graphene-65:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/26
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/10
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 21
-graphene-66:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/27
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/11
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 22
-graphene-67:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/28
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/12
-  pdu:
-    pdu_name: graphene-pdu3
-    pdu_position: 23
-graphene-68:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/29
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/13
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 17
-graphene-69:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/30
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/14
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 18
-graphene-70:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/31
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/15
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 19
-graphene-71:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/32
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/16
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 20
-graphene-72:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/33
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/17
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 21
-graphene-73:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/34
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/18
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 22
-graphene-74:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene2
-      switch_port: Gi1/0/35
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene2-ipmi
-      switch_port: 1/0/19
-  pdu:
-    pdu_name: graphene-pdu4
-    pdu_position: 23
-graphene-75:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/2
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 6
-graphene-76:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/1
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 7
-graphene-77:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/4
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 9
-graphene-78:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/3
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 10
-graphene-79:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/6
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 11
-graphene-80:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/5
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 12
-graphene-81:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/8
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 13
-graphene-82:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/7
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 14
-graphene-83:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/10
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 15
-graphene-84:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/9
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 9
-graphene-85:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/12
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/1
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 10
-graphene-86:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/11
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/2
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 11
-graphene-87:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/14
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/3
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 12
-graphene-88:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/13
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 13
-graphene-89:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/16
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 14
-graphene-90:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/15
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 15
-graphene-91:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/18
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/7
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 17
-graphene-92:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/17
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 18
-graphene-93:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/20
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 19
-graphene-94:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/19
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/10
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 20
-graphene-95:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/22
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/11
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 21
-graphene-96:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/21
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/12
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 22
-graphene-97:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/24
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/13
-  pdu:
-    pdu_name: graphene-pdu5
-    pdu_position: 23
-graphene-98:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/23
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/14
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 17
-graphene-99:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/26
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/15
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 18
-graphene-100:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/25
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/16
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 19
-graphene-101:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/28
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/17
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 20
-graphene-102:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/27
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/18
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 21
-graphene-103:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/30
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/19
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 22
-graphene-104:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene3
-      switch_port: Gi1/0/29
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/20
-  pdu:
-    pdu_name: graphene-pdu6
-    pdu_position: 23
-graphene-105:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/1
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 1
-graphene-106:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/2
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 2
-graphene-107:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/3
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 3
-graphene-108:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/4
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 4
-graphene-109:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/5
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 5
-graphene-110:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/6
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 6
-graphene-111:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/7
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 7
-graphene-112:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/8
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 8
-graphene-113:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/9
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 11
-graphene-114:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/10
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 12
-graphene-115:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/11
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/35
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 13
-graphene-116:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/12
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/36
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 14
-graphene-117:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/13
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/37
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 17
-graphene-118:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/14
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/38
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 18
-graphene-119:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/15
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/39
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 19
-graphene-120:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/16
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/40
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 20
-graphene-121:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/17
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/41
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 21
-graphene-122:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/18
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/42
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 22
-graphene-123:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/19
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/43
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 23
-graphene-124:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/20
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/44
-  pdu:
-    pdu_name: graphene-pdu7
-    pdu_position: 24
-graphene-125:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/21
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/1
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 1
-graphene-126:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/22
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/2
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 2
-graphene-127:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/23
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/3
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 3
-graphene-128:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/24
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 4
-graphene-129:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/25
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 5
-graphene-130:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/26
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 6
-graphene-131:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/27
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/7
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 7
-graphene-132:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/28
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 8
-graphene-133:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/29
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 11
-graphene-134:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/30
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/10
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 12
-graphene-135:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/31
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/11
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 13 
-graphene-136:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/32
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/12
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 14 
-graphene-137:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/33
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/13
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 15 
-graphene-138:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/34
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/14
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 18
-graphene-139:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/35
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/15
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 19
-graphene-140:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/36
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/16
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 20
-graphene-141:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/37
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/17
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 21
-graphene-142:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/38
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/18
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 22
-graphene-143:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/39
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/19
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 23
-graphene-144:
-  network_interfaces:
-    eth0:
-      switch_name: sgraphene4
-      switch_port: Gi1/0/40
-    ib0:
-      switch_name: sgrapheneib
-    bmc:
-      switch_name: sgraphene4-ipmi
-      switch_port: 1/0/20
-  pdu:
-    pdu_name: graphene-pdu8
-    pdu_position: 24
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-1.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
deleted file mode 100644
index e87a657197..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-1:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9281
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.1
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:82
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:80
-      ip6: fe80::2e0:81ff:fed5:680
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.1
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:83
-      ip: 172.17.64.1
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390003
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-10.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
deleted file mode 100644
index b03c3f8323..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-10:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:916d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.10
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:d0
-      ip6: fe80::2e0:81ff:fed5:6d0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.10
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:d2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:d3
-      ip: 172.17.64.10
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390012
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-100.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
deleted file mode 100644
index 5c6657da81..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-100:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d0d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.100
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:cc
-      ip6: fe80::2e0:81ff:fed5:7cc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.100
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:cd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ce
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:cf
-      ip: 172.17.64.100
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390102
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-101.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
deleted file mode 100644
index a34bb39894..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-101:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5cd9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.101
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:a0
-      ip6: fe80::2e0:81ff:fed5:6a0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.101
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:a3
-      ip: 172.17.64.101
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390103
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-102.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
deleted file mode 100644
index e3a413cf1a..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-102:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:71
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e71
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.102
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:72
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:bc
-      ip6: fe80::2e0:81ff:fed5:8bc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.102
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:bf
-      ip: 172.17.64.102
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390104
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-103.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
deleted file mode 100644
index 459d83448c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-103:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d49
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.103
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:c8
-      ip6: fe80::2e0:81ff:fed5:8c8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.103
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:cb
-      ip: 172.17.64.103
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390105
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-104.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
deleted file mode 100644
index 651323cee6..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-104:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d15
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.104
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:16
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:64
-      ip6: fe80::2e0:81ff:fed5:764
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.104
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:65
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:67
-      ip: 172.17.64.104
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390106
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-105.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
deleted file mode 100644
index 2a2f897ff1..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-105:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d19
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.105
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:bc
-      ip6: fe80::2e0:81ff:fed5:6bc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.105
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:bf
-      ip: 172.17.64.105
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390107
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-106.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
deleted file mode 100644
index 9fff3b2d72..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-106:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5cad
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.106
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:f4
-      ip6: fe80::2e0:81ff:fed5:7f4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.106
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:f6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:f7
-      ip: 172.17.64.106
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390108
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-107.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
deleted file mode 100644
index 74175de305..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-107:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d3d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.107
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:c8
-      ip6: fe80::2e0:81ff:fed5:7c8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.107
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:cb
-      ip: 172.17.64.107
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390109
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-108.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
deleted file mode 100644
index 37911f1059..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-108:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d21
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.108
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:22
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:14
-      ip6: fe80::2e0:81ff:fed5:714
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.108
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:17
-      ip: 172.17.64.108
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390110
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-109.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
deleted file mode 100644
index eae4630f66..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-109:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d25
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.109
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:26
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:30
-      ip6: fe80::2e0:81ff:fed5:830
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.109
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:33
-      ip: 172.17.64.109
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390111
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-11.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
deleted file mode 100644
index 37d0b02508..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-11:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9171
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.11
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:72
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:7c
-      ip6: fe80::2e0:81ff:fed5:87c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.11
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:7e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:7f
-      ip: 172.17.64.11
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390013
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-110.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
deleted file mode 100644
index 1ecc38dddb..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-110:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5ca9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.110
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:aa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:6c
-      ip6: fe80::2e0:81ff:fed5:76c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.110
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:6f
-      ip: 172.17.64.110
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390112
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-111.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
deleted file mode 100644
index 9fa2027a5b..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-111:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91
-      rate: 20000000000
-      ip6: fe80::202:c903:c:5591
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.111
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:92
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:58
-      ip6: fe80::2e0:81ff:fed5:858
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.111
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:5b
-      ip: 172.17.64.111
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390113b
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-112.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
deleted file mode 100644
index 96d6f70569..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-112:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:7e9d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.112
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:10
-      ip6: fe80::2e0:81ff:fed5:810
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.112
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:12
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:13
-      ip: 172.17.64.112
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390114
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-113.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
deleted file mode 100644
index 0634f4d1ce..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-113:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93b5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.113
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:bc
-      ip6: fe80::2e0:81ff:fed5:7bc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.113
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:bf
-      ip: 172.17.64.113
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390115
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-114.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
deleted file mode 100644
index 8bfb65c2c0..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-114:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93c5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.114
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:b0
-      ip6: fe80::2e0:81ff:fed5:6b0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.114
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:b2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:b3
-      ip: 172.17.64.114
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390116
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-115.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
deleted file mode 100644
index d7bc3f49e8..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-115:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9305
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.115
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:06
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:04
-      ip6: fe80::2e0:81ff:fed5:804
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.115
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:05
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:07
-      ip: 172.17.64.115
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390117
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-116.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
deleted file mode 100644
index 854adc9a4c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-116:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:931d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.116
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:28
-      ip6: fe80::2e0:81ff:fed5:828
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.116
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:2a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:2b
-      ip: 172.17.64.116
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390118
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-117.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
deleted file mode 100644
index 7be3cb9dcf..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-117:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9325
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.117
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:26
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:e4
-      ip6: fe80::2e0:81ff:fed5:6e4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.117
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:e7
-      ip: 172.17.64.117
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390119
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-118.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
deleted file mode 100644
index 264466815f..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-118:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.118
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:b8
-      ip6: fe80::2e0:81ff:fed5:7b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.118
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:bb
-      ip: 172.17.64.118
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390120
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-119.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
deleted file mode 100644
index c826820e0c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-119:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.119
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:f0
-      ip6: fe80::2e0:81ff:fed5:6f0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.119
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:f3
-      ip: 172.17.64.119
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390121
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-12.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
deleted file mode 100644
index a52d87ba75..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-12:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9381
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.12
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:82
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:8c
-      ip6: fe80::2e0:81ff:fed5:78c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.12
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:8e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:8f
-      ip: 172.17.64.12
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390014
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-120.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
deleted file mode 100644
index 199e1fa7df..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-120:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9329
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.120
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:ac
-      ip6: fe80::2e0:81ff:fed5:8ac
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.120
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ae
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:af
-      ip: 172.17.64.120
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390122
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-121.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
deleted file mode 100644
index 799290ac3e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-121:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:932d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.121
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:38
-      ip6: fe80::2e0:81ff:fed5:738
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.121
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:3a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:3b
-      ip: 172.17.64.121
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390123
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-122.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
deleted file mode 100644
index 25e5a0fcb4..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-122:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d85
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.122
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:38
-      ip6: fe80::2e0:81ff:fed5:838
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.122
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:3a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:3b
-      ip: 172.17.64.122
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390124
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-123.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
deleted file mode 100644
index 29676e58ce..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-123:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9219
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.123
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:ac
-      ip6: fe80::2e0:81ff:fed5:6ac
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.123
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ae
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:af
-      ip: 172.17.64.123
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390125
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-124.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
deleted file mode 100644
index 31fc43bea4..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-124:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61 
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.124
-      ip6: fe80::202:c903:2:7f61
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:a4
-      ip6: fe80::2e0:81ff:fed5:6a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.124
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:a7
-      ip: 172.17.64.124
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390126
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-125.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
deleted file mode 100644
index 86792fb148..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-125:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9391
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.125
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:92
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:68
-      ip6: fe80::2e0:81ff:fed5:868
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.125
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:6b
-      ip: 172.17.64.125
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390127
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-126.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
deleted file mode 100644
index 326dded7de..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-126:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:51
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9151
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.126
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:52
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:d0
-      ip6: fe80::2e0:81ff:fed5:8d0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.126
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:d2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:d3
-      ip: 172.17.64.126
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390128
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-127.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
deleted file mode 100644
index 0f224f2406..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-127:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9285
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.127
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:40
-      ip6: fe80::2e0:81ff:fed5:840
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.127
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:42
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:43
-      ip: 172.17.64.127
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390129
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-128.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
deleted file mode 100644
index a6764a48de..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-128:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9215
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.128
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:16
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:e4
-      ip6: fe80::2e0:81ff:fed5:8e4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.128
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:e7
-      ip: 172.17.64.128
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390130
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-129.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
deleted file mode 100644
index 3cbe2a455e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-129:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9205
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.129
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:06
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:1c
-      ip6: fe80::2e0:81ff:fed5:71c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.129
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:1e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:1f
-      ip: 172.17.64.129
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390131
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-13.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
deleted file mode 100644
index cabecc48d6..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-13:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9385
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.13
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:fc
-      ip6: fe80::2e0:81ff:fed5:6fc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.13
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:fe
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:ff
-      ip: 172.17.64.13
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390015
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-130.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
deleted file mode 100644
index 20322967dc..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-130:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9209
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.130
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d2:5a:34
-      ip6: fe80::2e0:81ff:fed2:5a34
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.130
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d2:5a:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d2:5a:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d2:5a:37
-      ip: 172.17.64.130
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390132b
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-131.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
deleted file mode 100644
index fca75e063b..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-131:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d 
-      rate: 20000000000
-      ip6: fe80::202:c903:b:914d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.131
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:f8
-      ip6: fe80::2e0:81ff:fed5:6f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.131
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:fb
-      ip: 172.17.64.131
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390133b
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-132.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
deleted file mode 100644
index cabe945b66..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-132:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:920d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.132
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:8c
-      ip6: fe80::2e0:81ff:fed5:88c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.132
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:8e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:8f
-      ip: 172.17.64.132
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390134
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-133.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
deleted file mode 100644
index f8f48c6e3f..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-133:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f7b3
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.133
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b4
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:e0
-      ip6: fe80::2e0:81ff:fed5:7e0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.133
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:e3
-      ip: 172.17.64.133
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390135
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-134.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
deleted file mode 100644
index 87b99d808d..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-134:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f44f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.134
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:50
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:e8
-      ip6: fe80::2e0:81ff:fed5:8e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.134
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:eb
-      ip: 172.17.64.134
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390136
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-135.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
deleted file mode 100644
index a0a5e9eac2..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-135:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f4c7
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.135
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c8
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:70
-      ip6: fe80::2e0:81ff:fed5:670
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.135
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:73
-      ip: 172.17.64.135
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390137
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-136.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
deleted file mode 100644
index 4a89dce781..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-136:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f847
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.136
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:48
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:7c
-      ip6: fe80::2e0:81ff:fed5:77c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.136
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:7e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:7f
-      ip: 172.17.64.136
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390138
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-137.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
deleted file mode 100644
index debd89c507..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-137:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f647
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.137
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:48
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:44
-      ip6: fe80::2e0:81ff:fed5:844
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.137
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:47
-      ip: 172.17.64.137
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390139
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-138.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
deleted file mode 100644
index 33c037f59c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-138:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f4c3
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.138
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c4
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:c4
-      ip6: fe80::2e0:81ff:fed5:8c4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.138
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:c7
-      ip: 172.17.64.138
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390140b
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-139.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
deleted file mode 100644
index 4f328ddc0a..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-139:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f7ff
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.139
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:00
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:80
-      ip6: fe80::2e0:81ff:fed5:780
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.139
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:83
-      ip: 172.17.64.139
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390141
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-14.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
deleted file mode 100644
index 695f0742e5..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-14:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93e1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:d4
-      ip6: fe80::2e0:81ff:fed5:6d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.14
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:d7
-      ip: 172.17.64.14
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390016
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-140.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
deleted file mode 100644
index bee1351c32..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-140:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f79f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.140
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a0
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:78
-      ip6: fe80::2e0:81ff:fed5:778
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.140
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:7a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:7b
-      ip: 172.17.64.140
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390142
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-141.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
deleted file mode 100644
index 1b303e04c2..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-141:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:93
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f793
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.141
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:94
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:74
-      ip6: fe80::2e0:81ff:fed5:874
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.141
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:76
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:77
-      ip: 172.17.64.141
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390143
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-142.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
deleted file mode 100644
index 21aacc5d68..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-142:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f7a7
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.142
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a8
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:8c
-      ip6: fe80::2e0:81ff:fed5:68c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.142
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:8e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:8f
-      ip: 172.17.64.142
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390144
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-143.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
deleted file mode 100644
index 2fac02b093..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-143:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f497
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.143
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:98
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:94
-      ip6: fe80::2e0:81ff:fed5:794
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.143
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:97
-      ip: 172.17.64.143
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390145
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-144.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
deleted file mode 100644
index b528fc23eb..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-144:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f85b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.144
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:b8
-      ip6: fe80::2e0:81ff:fed5:6b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.144
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:bb
-      ip: 172.17.64.144
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390146
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-15.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
deleted file mode 100644
index cb4b7298f9..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-15:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93c9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.15
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ca
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:e8
-      ip6: fe80::2e0:81ff:fed5:7e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.15
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:eb
-      ip: 172.17.64.15
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390017
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-16.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
deleted file mode 100644
index 17a9686b72..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-16:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9375
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.16
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:76
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:c0
-      ip6: fe80::2e0:81ff:fed5:7c0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.16
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:c2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:c3
-      ip: 172.17.64.16
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390018
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-17.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
deleted file mode 100644
index 0ae52de507..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-17:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9371
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.17
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:72
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:a8
-      ip6: fe80::2e0:81ff:fed5:8a8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.17
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:aa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:ab
-      ip: 172.17.64.17
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390019
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-18.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
deleted file mode 100644
index 8958b053bc..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-18:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:937d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.18
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:3c
-      ip6: fe80::2e0:81ff:fed5:83c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.18
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:3f
-      ip: 172.17.64.18
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390020
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-19.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
deleted file mode 100644
index 167df90022..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-19:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9155
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.19
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:56
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:b4
-      ip6: fe80::2e0:81ff:fed5:8b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.19
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:b6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:b7
-      ip: 172.17.64.19
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390021
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-2.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
deleted file mode 100644
index 0935e7fae1..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-2:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:915d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.2
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:70
-      ip6: fe80::2e0:81ff:fed5:770
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.2
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:73
-      ip: 172.17.64.2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390004
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-20.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
deleted file mode 100644
index eaf4fa13bb..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-20:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9145
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.20
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:46
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:68
-      ip6: fe80::2e0:81ff:fed5:768
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.20
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:6b
-      ip: 172.17.64.20
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390022
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-21.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
deleted file mode 100644
index b9f0dea5ac..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-21:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d 
-      rate: 20000000000
-      ip6: fe80::202:c903:4:536d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.21
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d2:59:f8
-      ip6: fe80::2e0:81ff:fed2:59f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.21
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d2:59:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d2:59:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d2:59:fb
-      ip: 172.17.64.21
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390023b
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-22.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
deleted file mode 100644
index c0ad9d4f85..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-22:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9379
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.22
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:d8
-      ip6: fe80::2e0:81ff:fed5:7d8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.22
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:db
-      ip: 172.17.64.22
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390024
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-23.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
deleted file mode 100644
index 0cf186bba7..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-23:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9365
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:66
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:c4
-      ip6: fe80::2e0:81ff:fed5:6c4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.23
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:c7
-      ip: 172.17.64.23
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390025
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-24.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
deleted file mode 100644
index d9ea55526d..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-24:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92cd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.24
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ce
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:10
-      ip6: fe80::2e0:81ff:fed5:710
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.24
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:12
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:13
-      ip: 172.17.64.24
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390026
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-25.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
deleted file mode 100644
index 5794f0d20c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-25:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92a5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.25
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:50
-      ip6: fe80::2e0:81ff:fed5:750
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.25
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:53
-      ip: 172.17.64.25
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390027
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-26.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
deleted file mode 100644
index bf3c733822..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-26:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:929d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.26
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:6c
-      ip6: fe80::2e0:81ff:fed5:86c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.26
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:6f
-      ip: 172.17.64.26
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390028
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-27.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
deleted file mode 100644
index f66182cf45..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-27:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9289
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.27
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:5c
-      ip6: fe80::2e0:81ff:fed5:75c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.27
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:5f
-      ip: 172.17.64.27
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390029
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-28.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
deleted file mode 100644
index 152e7b160b..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-28:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:928d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.28
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:f0 
-      ip6: fe80::2e0:81ff:fed5:65c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.28
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:5f
-      ip: 172.17.64.28
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390030
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-29.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
deleted file mode 100644
index 5cdefd6977..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-29:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd
-      rate: 20000000000
-      ip6: fe80::202:c903:b:90dd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.29
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:de
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:54 
-      ip6: fe80::2e0:81ff:fed5:654
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.29
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:f3
-      ip: 172.17.64.29
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390031
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-3.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
deleted file mode 100644
index 01df1800ef..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-3:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9159
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:70
-      ip6: fe80::2e0:81ff:fed5:870
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.3
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:73
-      ip: 172.17.64.3
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 605634005
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-30.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
deleted file mode 100644
index a868b39c7a..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-30:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9279
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.30
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:ec
-      ip6: fe80::2e0:81ff:fed5:8ec
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.30
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:ef
-      ip: 172.17.64.30
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390032
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-31.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
deleted file mode 100644
index 2133697543..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-31:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:921d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.31
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:60
-      ip6: fe80::2e0:81ff:fed5:660
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.31
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:63
-      ip: 172.17.64.31
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390033
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-32.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
deleted file mode 100644
index 99bc4e8d53..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-32:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:927d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.32
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:c8
-      ip6: fe80::2e0:81ff:fed5:6c8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.32
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:cb
-      ip: 172.17.64.32
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390034
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-33.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
deleted file mode 100644
index 5b4a807fa4..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-33:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:90d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.33
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:6c
-      ip6: fe80::2e0:81ff:fed5:66c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.33
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:6f
-      ip: 172.17.64.33
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390035
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-34.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
deleted file mode 100644
index 6ae23b9beb..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-34:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9165
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.34
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:66
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:9c
-      ip6: fe80::2e0:81ff:fed5:89c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.34
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:9e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:9f
-      ip: 172.17.64.34
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390036
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-35.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
deleted file mode 100644
index a28a23a822..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-35:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef 
-      rate: 20000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.35
-      ip6: fe80::202:c903:1:d5ef
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:f0
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:1c
-      ip6: fe80::2e0:81ff:fed5:81c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.35
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:1e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:1f
-      ip: 172.17.64.35
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390037
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-36.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
deleted file mode 100644
index 29a1ac6598..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-36:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.36
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ba
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:48
-      ip6: fe80::2e0:81ff:fed5:648
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.36
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:4a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:4b
-      ip: 172.17.64.36
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390038
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-37.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
deleted file mode 100644
index d022420f66..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-37:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92c5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.37
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:a4
-      ip6: fe80::2e0:81ff:fed5:8a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.37
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:a7
-      ip: 172.17.64.37
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390039
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-38.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
deleted file mode 100644
index 7d6a6da865..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-38:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92b1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.38
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:30
-      ip6: fe80::2e0:81ff:fed5:730
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.38
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:33
-      ip: 172.17.64.38
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390040
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-39.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
deleted file mode 100644
index ebedbe109f..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-39:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92c1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.39
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:dc
-      ip6: fe80::2e0:81ff:fed5:7dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.39
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:de
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:df
-      ip: 172.17.64.39
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390041
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-4.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
deleted file mode 100644
index cdd22a9c87..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-4:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd 
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92bd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.4
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:54
-      ip6: fe80::2e0:81ff:fed5:854
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.4
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:57
-      ip: 172.17.64.4
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390096b
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-40.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
deleted file mode 100644
index 02e3d9268f..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-40:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd 
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93cd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.40
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:f4
-      ip6: fe80::2e0:81ff:fed5:6f4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.40
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:f6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:10:20:3d:40:5f
-      ip: 172.17.64.40
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390042
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-41.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
deleted file mode 100644
index e5197f7927..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-41:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9299
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.41
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:ac
-      ip6: fe80::2e0:81ff:fed5:7ac
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.41
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ae
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:af
-      ip: 172.17.64.41
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390043
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-42.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
deleted file mode 100644
index 7e034e8441..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-42:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92a9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.42
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:aa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:88
-      ip6: fe80::2e0:81ff:fed5:788
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.42
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:8b
-      ip: 172.17.64.42
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390044
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-43.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
deleted file mode 100644
index 5e083d20d8..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-43:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92ad
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.43
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:24
-      ip6: fe80::2e0:81ff:fed5:824
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.43
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:27
-      ip: 172.17.64.43
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390045
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-44.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
deleted file mode 100644
index 447756a078..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-44:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92b5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.44
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:e0
-      ip6: fe80::2e0:81ff:fed5:6e0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.44
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:e3
-      ip: 172.17.64.44
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390046
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-45.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
deleted file mode 100644
index 3d86d96dc4..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-45.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-45:
-  bios:
-    version: V7.02
-    release_date: 01/06/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9321
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.45
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:22
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:5c
-      ip6: fe80::2e0:81ff:fed5:688
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.45
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:5f
-      ip: 172.17.64.45
-  block_devices:
-    sda:
-      model: Hitachi HDP72503 
-      device: sda
-      size: 320072933376
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390047
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-46.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
deleted file mode 100644
index 804d965b1e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-46:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93d5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.46
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:94
-      ip6: fe80::2e0:81ff:fed5:694
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.46
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:97
-      ip: 172.17.64.46
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390048
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-47.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
deleted file mode 100644
index 0b70f91266..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-47:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93e5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.47
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:94
-      ip6: fe80::2e0:81ff:fed5:894
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.47
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:97
-      ip: 172.17.64.47
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390049
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-48.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
deleted file mode 100644
index cfd3e13bac..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-48:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93dd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.48
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:de
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:e8
-      ip6: fe80::2e0:81ff:fed5:6e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.48
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:eb
-      ip: 172.17.64.48
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390050
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-49.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
deleted file mode 100644
index 4ca17bd27d..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-49:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93d1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.49
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:5c
-      ip6: fe80::2e0:81ff:fed5:85c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.49
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:5f
-      ip: 172.17.64.49
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390051
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-5.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
deleted file mode 100644
index 1067bd6671..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-5:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9179
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.5
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:b8
-      ip6: fe80::2e0:81ff:fed5:8b8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.5
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:bb
-      ip: 172.17.64.5
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390007
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-50.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
deleted file mode 100644
index 99f9042912..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-50:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92f1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.50
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:74
-      ip6: fe80::2e0:81ff:fed5:674
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.50
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:76
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:77
-      ip: 172.17.64.50
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390052
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-51.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
deleted file mode 100644
index f43d911a04..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-51:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92e9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.51
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ea
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:60
-      ip6: fe80::2e0:81ff:fed5:760
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.51
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:63
-      ip: 172.17.64.51
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390053
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-52.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
deleted file mode 100644
index 5283be4d7c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-52:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92f9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.52
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:0c
-      ip6: fe80::2e0:81ff:fed5:70c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.52
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:0d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:0e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:0f
-      ip: 172.17.64.52
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390054
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-53.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
deleted file mode 100644
index accec03d29..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-53:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9309
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.53
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:f8
-      ip6: fe80::2e0:81ff:fed5:7f8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.53
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:fb
-      ip: 172.17.64.53
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390055
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-54.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
deleted file mode 100644
index 4305556ad5..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-54:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9315
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.54
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:16
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:a8
-      ip6: fe80::2e0:81ff:fed5:7a8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.54
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:aa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:ab
-      ip: 172.17.64.54
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390056
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-55.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
deleted file mode 100644
index 51f5bf7d8d..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-55:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:930d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.55
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:90
-      ip6: fe80::2e0:81ff:fed5:890
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.55
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:92
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:93
-      ip: 172.17.64.55
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390057
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-56.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
deleted file mode 100644
index 852eb4fc90..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-56:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9189
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.56
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:78
-      ip6: fe80::2e0:81ff:fed5:678
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.56
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:7a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:7b
-      ip: 172.17.64.56
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390058
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-57.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
deleted file mode 100644
index c391c5a81c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-57:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:918d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.57
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:a0
-      ip6: fe80::2e0:81ff:fed5:8a0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.57
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:a3
-      ip: 172.17.64.57
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390059
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-58.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
deleted file mode 100644
index 4c7222c4fa..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-58:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:919d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.58
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:34
-      ip6: fe80::2e0:81ff:fed5:734
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.58
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:37
-      ip: 172.17.64.58
-  block_devices:
-    sda:
-      model: Hitachi HDP72503
-      device: sda
-      size: 320072933376
-      rev: A52A 
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390060
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-59.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
deleted file mode 100644
index 775b13239e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-59:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9195
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.59
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:2c
-      ip6: fe80::2e0:81ff:fed5:72c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.59
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:2e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:2f
-      ip: 172.17.64.59
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390061
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-6.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
deleted file mode 100644
index c99dafcb76..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-6:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:917d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.6
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:ec
-      ip6: fe80::2e0:81ff:fed5:6ec
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.6
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:ef
-      ip: 172.17.64.6
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390008
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-60.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
deleted file mode 100644
index 3be52ef140..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-60:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9185
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.60
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:86
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:4c
-      ip6: fe80::2e0:81ff:fed5:84c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.60
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:4f
-      ip: 172.17.64.60
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390062
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-61.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
deleted file mode 100644
index 7157ee4d78..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-61:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9191
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.61
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:92
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:00
-      ip6: fe80::2e0:81ff:fed5:700
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.61
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:02
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:03
-      ip: 172.17.64.61
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390063
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-62.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
deleted file mode 100644
index 2f7ab7ea92..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-62:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9199
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.62
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:c4
-      ip6: fe80::2e0:81ff:fed5:7c4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.62
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:c7
-      ip: 172.17.64.62
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390064
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-63.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
deleted file mode 100644
index 05a7676580..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-63:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9181
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.63
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:82
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:68
-      ip6: fe80::2e0:81ff:fed5:668
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.63
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:6b
-      ip: 172.17.64.63
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390065
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-64.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
deleted file mode 100644
index 789c9d3a60..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-64:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92a1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.64
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:88
-      ip6: fe80::2e0:81ff:fed5:888
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.64
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:8b
-      ip: 172.17.64.64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390066
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-65.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
deleted file mode 100644
index 8a5e059792..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-65:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.65
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:44
-      ip6: fe80::2e0:81ff:fed5:744
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.65
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:47
-      ip: 172.17.64.65
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390067
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-66.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
deleted file mode 100644
index 720de02a4f..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-66:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9149
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.66
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:14
-      ip6: fe80::2e0:81ff:fed5:814
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.66
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:17
-      ip: 172.17.64.66
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390068
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-67.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
deleted file mode 100644
index da9d215824..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-67:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.67
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ba
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:b0
-      ip6: fe80::2e0:81ff:fed5:7b0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.67
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:b2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:b3
-      ip: 172.17.64.67
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390069
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-68.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
deleted file mode 100644
index d2ae5b53bc..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-68:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9291
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.68
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:92
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:50
-      ip6: fe80::2e0:81ff:fed5:650
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.68
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:53
-      ip: 172.17.64.68
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390070
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-69.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
deleted file mode 100644
index 3e5614954b..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-69:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93c1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.69
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:98
-      ip6: fe80::2e0:81ff:fed5:698
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.69
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:99
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:9a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:9b
-      ip: 172.17.64.69
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390071
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-7.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
deleted file mode 100644
index b95aba34ea..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-7:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9161
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.7
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:62
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:3c
-      ip6: fe80::2e0:81ff:fed5:73c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.7
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:3f
-      ip: 172.17.64.7
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390009
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-70.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
deleted file mode 100644
index e7fd8f4987..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-70:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9311
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.70
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:12
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:4c
-      ip6: fe80::2e0:81ff:fed5:74c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.70
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:4f
-      ip: 172.17.64.70
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390072
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-71.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
deleted file mode 100644
index 95ab1b881e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-71:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92ed
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.71
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ee
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:28
-      ip6: fe80::2e0:81ff:fed5:728
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.71
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:2a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:2b
-      ip: 172.17.64.71
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390073
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-72.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
deleted file mode 100644
index cc9bcb0b44..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-72:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9295
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.72
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:e4
-      ip6: fe80::2e0:81ff:fed5:7e4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.72
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:e7
-      ip: 172.17.64.72
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390074
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-73.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
deleted file mode 100644
index a3a6b294a4..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-73:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92fd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.73
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:40
-      ip6: fe80::2e0:81ff:fed5:740
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.73
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:42
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:43
-      ip: 172.17.64.73
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390075
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-74.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
deleted file mode 100644
index a5bbd72090..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-74:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92dd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.74
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:80
-      ip6: fe80::2e0:81ff:fed5:880
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.74
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:83
-      ip: 172.17.64.74
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390076
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-75.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
deleted file mode 100644
index 4c668d21b8..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-75:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92e5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.75
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:04
-      ip6: fe80::2e0:81ff:fed5:704
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.75
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:05
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:07
-      ip: 172.17.64.75
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390077
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-76.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
deleted file mode 100644
index 8c46ed9ede..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-76:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92d5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.76
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:20
-      ip6: fe80::2e0:81ff:fed5:720
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.76
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:21
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:22
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:23
-      ip: 172.17.64.76
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390078
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-77.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
deleted file mode 100644
index 6d07af8f5e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-77:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92e1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.77
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:a0
-      ip6: fe80::2e0:81ff:fed5:7a0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.77
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:a3
-      ip: 172.17.64.77
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390079
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-78.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
deleted file mode 100644
index d670247f29..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-78:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9301
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.78
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:02
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:50
-      ip6: fe80::2e0:81ff:fed5:850
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.78
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:53
-      ip: 172.17.64.78
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390080
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-79.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
deleted file mode 100644
index de729adc0f..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-79:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92f5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.79
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:78
-      ip6: fe80::2e0:81ff:fed5:878
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.79
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:7a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:7b
-      ip: 172.17.64.79
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390081
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-8.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
deleted file mode 100644
index b45a017eb8..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-8:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9175
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.8
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:76
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:08
-      ip6: fe80::2e0:81ff:fed5:808
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.8
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:0a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:0b
-      ip: 172.17.64.8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390010
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-80.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
deleted file mode 100644
index a33a8f1149..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-80:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92d1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.80
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:d8
-      ip6: fe80::2e0:81ff:fed5:6d8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.80
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:db
-      ip: 172.17.64.80
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390082
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-81.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
deleted file mode 100644
index 0a16a201e7..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-81:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93a9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.81
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:aa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:24
-      ip6: fe80::2e0:81ff:fed5:724
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.81
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:27
-      ip: 172.17.64.81
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390083
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-82.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
deleted file mode 100644
index 86c822ee2d..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-82:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9395
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.82
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:b4
-      ip6: fe80::2e0:81ff:fed5:7b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.82
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:b6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:b7
-      ip: 172.17.64.82
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390084
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-83.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
deleted file mode 100644
index c143c6ef20..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-83:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93a5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.83
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:90
-      ip6: fe80::2e0:81ff:fed5:690
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.83
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:92
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:93
-      ip: 172.17.64.83
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390085
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-84.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
deleted file mode 100644
index be19e7c028..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-84:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d
-      rate: 20000000000 
-      management: false
-      enabled: true 
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.84
-      ip6: fe80::202:c903:b:939d 
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:18
-      ip6: fe80::2e0:81ff:fed5:718
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.84
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:19
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:1a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:1b
-      ip: 172.17.64.84
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390086
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-85.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
deleted file mode 100644
index e1c35854ae..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-85:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9399
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.85
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:ec
-      ip6: fe80::2e0:81ff:fed5:7ec
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.85
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:ef
-      ip: 172.17.64.85
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390087
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-86.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
deleted file mode 100644
index 66b1891983..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-86:
-  bios:
-    version: V7.04
-    release_date: 02/10/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93a1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.86
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:0c
-      ip6: fe80::2e0:81ff:fed5:80c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.86
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:0d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:0e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:0f
-      ip: 172.17.64.86
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390088
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-87.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
deleted file mode 100644
index 54d81b7e4c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-87:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93ad
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.87
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:58
-      ip6: fe80::2e0:81ff:fed5:758
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.87
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:5b
-      ip: 172.17.64.87
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390089
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-88.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
deleted file mode 100644
index 39e0b32f69..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-88:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93b1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.88
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:60
-      ip6: fe80::2e0:81ff:fed5:860
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.88
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:63
-      ip: 172.17.64.88
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390090
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-89.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
deleted file mode 100644
index 852fcabf8c..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-89:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5ced
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.89
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ee
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:98
-      ip6: fe80::2e0:81ff:fed5:898
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.89
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:99
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:9a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:9b
-      ip: 172.17.64.89
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390091
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-9.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
deleted file mode 100644
index d84f79c148..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-9:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9169
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.9
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:84
-      ip6: fe80::2e0:81ff:fed5:884
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.9
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:86
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:87
-      ip: 172.17.64.9
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390011
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-90.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
deleted file mode 100644
index a7187ec443..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-90:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d09
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.90
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:64
-      ip6: fe80::2e0:81ff:fed5:664
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.90
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:65
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:67
-      ip: 172.17.64.90
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390092
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-91.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
deleted file mode 100644
index 9ae97d81c5..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-91:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5cd1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.91
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:dc
-      ip6: fe80::2e0:81ff:fed5:6dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.91
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:de
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:df
-      ip: 172.17.64.91
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390093
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-92.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
deleted file mode 100644
index e27a8719ad..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-92:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5ce5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.92
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:a4
-      ip6: fe80::2e0:81ff:fed5:7a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.92
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:a7
-      ip: 172.17.64.92
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390094
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-93.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
deleted file mode 100644
index 16f13e944e..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-93:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5ead
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.93
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:4c
-      ip6: fe80::2e0:81ff:fed5:64c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.93
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:4f
-      ip: 172.17.64.93
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390095
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-94.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
deleted file mode 100644
index f789bd1efe..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-94:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5c95
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.94
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:90
-      ip6: fe80::2e0:81ff:fed5:790
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.94
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:92
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:93
-      ip: 172.17.64.94
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390096
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-95.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
deleted file mode 100644
index 01397690c0..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-95:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e95
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.95
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:c0
-      ip6: fe80::2e0:81ff:fed5:6c0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.95
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:c2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:c3
-      ip: 172.17.64.95
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390097
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-96.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
deleted file mode 100644
index c84be20bce..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-96:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e9d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.96
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:34
-      ip6: fe80::2e0:81ff:fed5:834
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.96
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:37
-      ip: 172.17.64.96
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390098
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-97.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
deleted file mode 100644
index 40772c0711..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-97:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5ed5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.97
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:00
-      ip6: fe80::2e0:81ff:fed5:800
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.97
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:02
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:03
-      ip: 172.17.64.97
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390099
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-98.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
deleted file mode 100644
index af6641855b..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-98:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e99
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.98
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:d4
-      ip6: fe80::2e0:81ff:fed5:7d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.98
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:d7
-      ip: 172.17.64.98
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390100
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-99.yaml b/generators/input/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
deleted file mode 100644
index a6a7430c39..0000000000
--- a/generators/input/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphene-99:
-  bios:
-    version: V7.01e
-    release_date: 02/18/2011
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5eb1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.99
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:d4
-      ip6: fe80::2e0:81ff:fed5:8d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.99
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:d7
-      ip: 172.17.64.99
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: Hitachi HDS72103
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial_number: 1009390101
-    manufacturer: TYAN
-    product_name: S5501
diff --git a/generators/input/sites/nancy/clusters/graphique/graphique.rb b/generators/input/sites/nancy/clusters/graphique/graphique.rb
deleted file mode 100644
index 00e9ebe48e..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/graphique.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :graphique do |cluster_uid|
-    model "Dell R720"
-    created_at Time.parse("2015-05-12 17:00 GMT").httpdate
-    kavlan true
-    queues ['admin', 'production']
-
-    6.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 0.G,
-        :node_flops => 0.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['admin', 'production'],
-          :max_walltime => {
-              1=>86400,
-              2=>86400,
-              3=>172800,
-              4=>172800,
-              5=>31536000,
-              6=>31536000,
-          }[i+1]
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'), 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => false,
-          :device           => "eth0",
-          :vendor           => 'Broadcom',
-          :model            => 'Broadcom 57800 10 GB DA/SFP+',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'graphique', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('nancy', 'graphique', node_uid, 'eth0'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :device           => "eth1",
-          :bridged          => false,
-          :vendor           => 'Broadcom',
-          :model            => 'Broadcom 57800 10 GB DA/SFP+',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'rate'),
-          :enabled          => true,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :device           => "eth2",
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :bridged          => true,
-          :vendor           => 'Broadcom',
-          :model            => 'Broadcom 57800 1 GB Base-T',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'ip'),
-          #:ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'ip6'),
-          :switch           => net_switch_lookup('nancy', 'graphique', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('nancy', 'graphique', node_uid, 'eth2'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :device           => "eth3",
-          :bridged          => false,
-          :vendor           => 'Broadcom',
-          :model            => 'Broadcom 57800 1 GB Base-T',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        sensors({
-        })
-        gpu({
-          :gpu         =>  true,
-          :gpu_count   =>  2,
-          :gpu_vendor  =>  "Nvidia",
-          :gpu_model   =>  "GTX 980",
-        })
-
-      end
-    end
- end # cluster graphique
-end
diff --git a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/generators/input/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
deleted file mode 100644
index 843fce12ee..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-graphique-1:
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  block_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330
-      rev: 4.24
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  chassis:
-    serial_number: BYGMJ32
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      driver: bnx2x
-      mac: b0:83:fe:e5:c0:54
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: b0:83:fe:e5:c0:56
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth2:
-      interface: Ethernet
-      ip: 172.16.67.1
-      driver: bnx2x
-      mac: b0:83:fe:e5:c0:58
-      rate: 1000000000
-      mounted: true
-      mountable: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: bnx2x
-      mac: b0:83:fe:e5:c0:5a
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.1
-      mac: b0:83:fe:e4:69:d8
diff --git a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/generators/input/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
deleted file mode 100644
index 0cf88b3fe5..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-graphique-2:
-  chassis:
-    serial_number: 7YTRV42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:07:6a:c8
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:07:6a:ca
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth2:
-      interface: Ethernet
-      ip: 172.16.67.2
-      driver: bnx2x
-      mac: 44:a8:42:07:6a:cc
-      rate: 1000000000
-      mounted: true
-      mountable: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:07:6a:ce
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.2
-      mac: 18:fb:7b:9b:91:55
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  block_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330
-      rev: 4.24
-  main_memory:
-    ram_size: 68719476736
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
diff --git a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/generators/input/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
deleted file mode 100644
index e05ff14899..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-graphique-3:
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial_number: 9ZTRV42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  block_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330
-      rev: 4.24
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:33:3d
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:33:3f
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth2:
-      interface: Ethernet
-      ip: 172.16.67.3
-      driver: bnx2x
-      mac: 44:a8:42:0a:33:41
-      rate: 1000000000
-      mounted: true
-      mountable: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:33:43
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.3
-      mac: 18:fb:7b:9b:68:d3
diff --git a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/generators/input/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
deleted file mode 100644
index 6c7ae0154f..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-graphique-4:
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330
-      rev: 4.24
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:8d:0d
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:8d:0f
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth2:
-      interface: Ethernet
-      ip: 172.16.67.4
-      driver: bnx2x
-      mac: 44:a8:42:0a:8d:11
-      rate: 1000000000
-      enabled: true
-      mounted: true
-      mountable: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:8d:13
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.4
-      mac: 18:fb:7b:9b:91:6d
-  chassis:
-    serial_number: HYTRV42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
diff --git a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/generators/input/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
deleted file mode 100644
index aa74e028d8..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-graphique-5:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:4b:9b
-      rate: 10000000000
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:4b:9d
-      rate: 10000000000
-      mounted: false
-      enabled: false
-      mountable: false
-      management: false
-    eth2:
-      interface: Ethernet
-      ip: 172.16.67.5
-      driver: bnx2x
-      mac: 44:a8:42:0a:4b:9f
-      rate: 1000000000
-      mounted: true
-      mountable: true
-      management: false
-      enabled: true
-    eth3:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:0a:4b:a1
-      mounted: false
-      mountable: false
-      management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.5
-      mac: 18:fb:7b:9b:91:d3
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330
-      rev: 4.24
-  chassis:
-    serial_number: BXTRV42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
diff --git a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/generators/input/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
deleted file mode 100644
index ccbe4ec239..0000000000
--- a/generators/input/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-graphique-6:
-  block_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330 Mini
-      rev: 4.24
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  chassis:
-    serial_number: HZSY752
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R730
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 24
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:15:cd:e6
-      rate: 10000000000
-      mounted: false
-      management: false
-      enabled: false
-      mountable: false
-    eth1:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:15:cd:e8
-      rate: 10000000000
-      mounted: false
-      management: false
-      enabled: false
-      mountable: false
-    eth2:
-      interface: Ethernet
-      ip: 172.16.67.6
-      driver: bnx2x
-      mac: 44:a8:42:15:cd:ea
-      rate: 1000000000
-      mounted: true
-      management: false
-      enabled: true
-      mountable: true
-    eth3:
-      interface: Ethernet
-      driver: bnx2x
-      mac: 44:a8:42:15:cd:ec
-      rate: 1000000000
-      mounted: false
-      management: false
-      enabled: false
-      mountable: false
-    bmc:
-      ip: 172.17.67.6
-      mac: 18:FB:7B:9B:AF:D9
- 
diff --git a/generators/input/sites/nancy/clusters/graphite/graphite.rb b/generators/input/sites/nancy/clusters/graphite/graphite.rb
deleted file mode 100644
index 0a360ee3b9..0000000000
--- a/generators/input/sites/nancy/clusters/graphite/graphite.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :graphite do |cluster_uid|
-    model "Dell R720"
-    created_at Time.parse("2013-12-5").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    4.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 13.17.G,
-          :node_flops => 187.90.G
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :max_walltime => 0,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA II',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'SSD'
-        },
-        {
-          :interface  => 'SATA II',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage    => 'SSD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => "intel",
-          :version          => "82599EB",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('nancy','graphite', node_uid),
-          :switch_port      => net_port_lookup('nancy','graphite', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "intel",
-          :version          => "82599EB",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "intel",
-          :version          => "I350",
-          :switch           => net_switch_lookup('nancy','graphite', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('nancy','graphite', node_uid, 'eth2'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => "intel",
-          :version          => "I350",
-          :switch           => net_switch_lookup('nancy','graphite', node_uid, 'eth3'),
-          :switch_port      => net_port_lookup('nancy','graphite', node_uid, 'eth3'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => true,
-          :mounted          => true,
-          :bridged          => true,
-          :device           => "ib0",
-          :vendor           => 'Mellanox',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mac'),
-          :ip               => "172.16.68.#{i+9}",
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :hwid             => lookup('graphite_manual', node_uid, 'network_interfaces', 'ib0', 'hwid'),
-          :switch           => "sgraoullyib",
-          :ib_switch_card   => lookup('graphite_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-          :ib_switch_card_pos => lookup('graphite_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "DELL",
-          :version => "IDRAC7",
-          :device => "bmc",
-          :ip => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :switch => lookup('graphite_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-          :switch_port => lookup('graphite_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port')
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        mic({
-          :mic        => true,
-          :mic_count  => lookup('graphite_manual', node_uid, 'mic', 'mic_count'),
-          :mic_model => lookup('graphite_manual', node_uid, 'mic', 'mic_model'),
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-       sensors({
-              :power => {
-                :available => true,
-                :via => {
-                  :api => { :metric => 'power' },
-                  :pdu => [ {
-                    :uid  => lookup('graphite_manual', node_uid, 'pdu1', 'pdu_name'),
-                    :port => lookup('graphite_manual', node_uid, 'pdu1', 'pdu_position'),
-                  },
- 		          {
-                    :uid  => lookup('graphite_manual', node_uid, 'pdu2', 'pdu_name'),
-                    :port => lookup('graphite_manual', node_uid, 'pdu2', 'pdu_position'),
-                  } ]
-                }
-              }
-            })
-
-      end
-    end
-  end # cluster graphite
-end
diff --git a/generators/input/sites/nancy/clusters/graphite/graphite_manual.yaml b/generators/input/sites/nancy/clusters/graphite/graphite_manual.yaml
deleted file mode 100644
index 87351ff7d4..0000000000
--- a/generators/input/sites/nancy/clusters/graphite/graphite_manual.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-graphite-1:
-  network_interfaces:
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/41
-  pdu1:
-    pdu_name: graphene-pdu9
-    pdu_position: 23
-  pdu2:
-    pdu_name: graphene-pdu9
-    pdu_position: 24
-  mic:
-    mic_count: 1
-    mic_model: 7120P
-graphite-2:
-  network_interfaces:
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/43
-  pdu1:
-    pdu_name: graphene-pdu9
-    pdu_position: 21
-  pdu2:
-    pdu_name: graphene-pdu9
-    pdu_position: 22
-  mic:
-    mic_count: 1
-    mic_model: 7120P
-graphite-3:
-  network_interfaces:
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/45
-  pdu1:
-    pdu_name: graphene-pdu9
-    pdu_position: 19
-  pdu2:
-    pdu_name: graphene-pdu9
-    pdu_position: 20 
-  mic:
-    mic_count: 1
-    mic_model: 7120P
-graphite-4:
-  network_interfaces:
-    bmc:
-      switch_name: sgraphene3-ipmi
-      switch_port: 1/0/47
-  pdu1:
-    pdu_name: graphene-pdu9
-    pdu_position: 5
-  pdu2:
-    pdu_name: graphene-pdu9
-    pdu_position: 6
-  mic:
-    mic_count: 1
-    mic_model: 7120P
diff --git a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/generators/input/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
deleted file mode 100644
index 05e9799fb7..0000000000
--- a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graphite-1:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5
-    release_date: 01/28/2015
-  chassis:
-    serial_number: 27Q7NZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 959
-      timewrite: 2205
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 270582939648
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:12:6c
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.68.1
-      driver: ixgbe
-      mac: b8:ca:3a:69:12:68
-      rate: 10000000000
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:12:6d
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:12:6a
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:d1
-      rate: 56000000000
-      version: MT4099
-      mounted: true
-      management: false
-    bmc:
-      ip: 172.17.68.1
-      mac: f0:1f:af:e1:9a:0c
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/generators/input/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
deleted file mode 100644
index d474070bec..0000000000
--- a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-graphite-2:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5
-    release_date: 01/28/2015
-  chassis:
-    serial_number: B6Q7NZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 956
-      timewrite: 1991
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 270582939648
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:1e:8c
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.68.2
-      driver: ixgbe
-      mac: b8:ca:3a:69:1e:88
-      rate: 10000000000
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:1e:8d
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:1e:8a
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:11
-      rate: 56000000000
-      version: MT4099
-      mounted: true
-      management: false
-    bmc:
-      ip: 172.17.68.2
-      mac: f0:1f:af:e1:97:56
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/generators/input/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
deleted file mode 100644
index 29354e53f6..0000000000
--- a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphite-3:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5
-    release_date: 01/28/2015
-  chassis:
-    serial_number: G5Q7NZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 958
-      timewrite: 2963
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 270582939648
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:11:dc
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:11:dd
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.68.3
-      driver: ixgbe
-      mac: b8:ca:3a:69:11:d8
-      rate: 10000000000
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:11:da
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:e1
-      rate: 56000000000
-      version: MT4099
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    bmc:
-      ip: 172.17.68.3
-      mac: f0:1f:af:df:5b:9c
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/generators/input/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
deleted file mode 100644
index 6e9921ea0e..0000000000
--- a/generators/input/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-graphite-4:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.5
-    release_date: 01/28/2015
-  chassis:
-    serial_number: 66Q7NZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  block_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 978
-      timewrite: 3300
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 270582939648
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.68.4
-      driver: ixgbe
-      mac: b8:ca:3a:69:12:40
-      rate: 10000000000
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:12:44
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:12:45
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:12:42
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:c1
-      rate: 56000000000
-      version: MT4099
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    bmc:
-      ip: 172.17.68.4
-      mac: f0:1f:af:e0:3e:7f
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/griffon/griffon.rb b/generators/input/sites/nancy/clusters/griffon/griffon.rb
deleted file mode 100644
index df02313ee0..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/griffon.rb
+++ /dev/null
@@ -1,278 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :griffon do |cluster_uid|
-    model "Carri System CS-5393B"
-    created_at Time.parse("2009-04-10").httpdate
-    kavlan true
-    queues ['admin', 'default']
-    ([*0..28]+[*57..59]).each do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 7.963.G,
-        :node_flops => 52.5.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :max_walltime => 0,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['admin', 'default']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
-          :release  => "Jessie",
-          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
-          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SATA II',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        if (11<=i+1 and i+1<=14) then
-          network_adapters [{
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-            :bridged          => true,
-            :device           => "eth0",
-            :vendor           => "intel",
-            :version          => "80003ES2LAN",
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-            :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-            :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-            :switch           => net_switch_lookup('nancy','griffon', node_uid),
-            :switch_port      => net_port_lookup('nancy','griffon', node_uid),
-            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-          },
-          {
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-            :rate             => 1.G,
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-            :bridged          => false,
-            :device           => "eth1",
-            :vendor           => "intel",
-            :version          => "BCM5721",
-            :switch           => net_switch_lookup('nancy','griffon', node_uid, 'eth1'),
-            :switch_port      => net_port_lookup('nancy','griffon', node_uid, 'eth1'),
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-          },
-          {
-            :interface        => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'interface'),
-            :rate             => 10.G,
-            :enabled          => false, # see bug 6490,
-            :management       => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'management'),
-            :mountable        => false, # see bug 6490,
-            :mounted          => false, # see bug 6490,
-            :bridged          => false,
-            :device           => "eth2",
-            :vendor           => "myrinet",
-            :version          => "Myri-10G",
-            :driver           => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'driver'),
-            :mac              => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mac')
-          },
-          {
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-            :device           => "ib0",
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-            :vendor           => 'Mellanox',
-            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-            :ip6               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-            :switch           => "sgriffonib",
-            :ib_switch_card   => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-            :ib_switch_card_pos => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
-            :hwid             => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'hwid')
-          },
-          {
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-            :device           => "ib1",
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-            :vendor           => 'Mellanox',
-            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-          },
-          {
-            :interface            => 'Ethernet',
-            :rate                 => 100.M,
-            :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-            :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-            :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-            :switch               => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-            :switch_port          => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
-            :enabled              => true,
-            :mounted              => false,
-            :mountable            => false,
-            :management           => true,
-            :device               => "bmc",
-            :vendor               => "Tyan",
-            :version              => "M3296"
-          }]
-	else
-          network_adapters [{
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-            :bridged          => true,
-            :device           => "eth0",
-            :vendor           => "intel",
-            :version          => "80003ES2LAN",
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-            :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-            :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-            :switch           => net_switch_lookup('nancy','griffon', node_uid),
-            :switch_port      => net_port_lookup('nancy','griffon', node_uid),
-            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-          },
-          {
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-            :rate             => 1.G,
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-            :bridged          => false,
-            :device           => "eth1",
-            :vendor           => "intel",
-            :version          => "BCM5721",
-            :switch           => net_switch_lookup('nancy','griffon', node_uid, 'eth1'),
-            :switch_port      => net_port_lookup('nancy','griffon', node_uid, 'eth1'),
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-          },
-          {
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-            :device           => "ib0",
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-            :vendor           => 'Mellanox',
-            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-            :ip6               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-            :switch           => "sgriffonib",
-            :ib_switch_card   => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-            :ib_switch_card_pos => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
-            :hwid             => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'hwid')
-          },
-          {
-            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-            :device           => "ib1",
-            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-            :vendor           => 'Mellanox',
-            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
-            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-          },
-          {
-            :interface            => 'Ethernet',
-            :rate                 => 100.M,
-            :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-            :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-            :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-            :switch               => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-            :switch_port          => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
-            :enabled              => true,
-            :mounted              => false,
-            :mountable            => false,
-            :management           => true,
-            :device               => "bmc",
-            :vendor               => "Tyan",
-            :version              => "M3296"
-          }]
-	end
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true, # Set to true when pdu resources will be declared
-            :via => {
-              :pdu => [ { :uid => lookup('griffon_manual', node_uid, 'pdu', 'pdu_name') } ]
-            }
-          }
-        })
-
-      end
-    end
-  end # cluster griffon
-end # nancy
diff --git a/generators/input/sites/nancy/clusters/griffon/griffon_manual.yaml b/generators/input/sites/nancy/clusters/griffon/griffon_manual.yaml
deleted file mode 100644
index 8d97ce021e..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/griffon_manual.yaml
+++ /dev/null
@@ -1,1391 +0,0 @@
----
-griffon-1:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/1
-    ib0:
-      hwid: '0xC903000318F0'
-      line_card: '0x000b8cffff003106'
-      position: 1
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/1
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 4
-griffon-2:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/2
-    ib0:
-      hwid: '0xC90300028064'
-      line_card: '0x000b8cffff003106'
-      position: 2
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/2
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 3
-griffon-3:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/3
-    ib0:
-      hwid: '0xC90300027F60'
-      line_card: '0x000b8cffff003106'
-      position: 3
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/3
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 2
-griffon-4:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/4
-    ib0:
-      hwid: '0xC90300028068'
-      line_card: '0x000b8cffff003106'
-      position: 4
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 1
-griffon-5:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/5
-    ib0:
-      hwid: '0xC903000280C0'
-      line_card: '0x000b8cffff003106'
-      position: 5
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 3
-griffon-6:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/O/6
-    ib0:
-      hwid: '0xC903000280AC'
-      line_card: '0x000b8cffff003106'
-      position: 6
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 4
-griffon-7:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/7
-    ib0:
-      hwid: '0xC90300028054'
-      line_card: '0x000b8cffff003106'
-      position: 7
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/7
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 5
-griffon-8:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/8
-    ib0:
-      hwid: '0xC903000280C8'
-      line_card: '0x000b8cffff003106'
-      position: 8
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 6
-griffon-9:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/10
-    ib0:
-      hwid: '0xC9030002805C'
-      line_card: '0x000b8cffff003106'
-      position: 9
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 10
-griffon-10:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/O/9
-    ib0:
-      hwid: '0xC90300027F58'
-      line_card: '0x000b8cffff003106'
-      position: 10
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/10
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 11
-griffon-11:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/25
-    eth1:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/20
-    eth2:
-      interface: Ethernet
-      driver: myri10ge 
-      mac: 00:60:dd:46:84:b7 
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-      switch_name: sgriffon1
-      switch_port: TGi1/1/1
-    ib0:
-      hwid: '0xC90300028008'
-      line_card: '0x000b8cffff003106'
-      position: 11
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 12
-griffon-12:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/26
-    eth1:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/44
-    eth2:
-      interface: Ethernet
-      driver: myri10ge 
-      mac: 00:60:dd:46:84:b9 
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-      switch_name: sgriffon1
-      switch_port: TGi1/2/1
-    ib0:
-      hwid: '0xC903000280DC'
-      line_card: '0x000b8cffff003106'
-      position: 12
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 13
-griffon-13:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/27
-    eth1:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/21
-    eth2:
-      interface: Ethernet
-      driver: myri10ge 
-      mac: 00:60:dd:46:84:a8 
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-      switch_name: sgriffon1
-      switch_port: TGi1/1/2
-    ib0:
-      hwid: '0xC903000280BC'
-      line_card: '0x000b8cffff003054'
-      position: 1
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 14
-griffon-14:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/28
-    eth1:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/45
-    eth2:
-      interface: Ethernet
-      driver: myri10ge 
-      mac: 00:60:dd:46:84:b8 
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-      switch_name: sgriffon1
-      switch_port: TGi1/1/2
-    ib0:
-      hwid: '0xC903000280CC'
-      line_card: '0x000b8cffff003054'
-      position: 2
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 15
-griffon-15:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/29
-    ib0:
-      hwid: '0xC903000280B4'
-      line_card: '0x000b8cffff003054'
-      position: 3
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 17
-griffon-16:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/30
-    ib0:
-      hwid: '0xC9030003303E'
-      line_card: '0x000b8cffff003054'
-      position: 4
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 18
-griffon-17:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/31
-    ib0:
-      hwid: '0xC90300033016'
-      line_card: '0x000b8cffff003054'
-      position: 5
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 19
-griffon-18:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/32
-    ib0:
-      hwid: '0xC9030003302A'
-      line_card: '0x000b8cffff003054'
-      position: 6
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 20
-griffon-19:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/33
-    ib0:
-      hwid: '0xC90300033036'
-      line_card: '0x000b8cffff003054'
-      position: 7
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 21
-griffon-20:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/34
-    ib0:
-      hwid: '0xC90300032FCA'
-      line_card: '0x000b8cffff003101'
-      position: 2
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 22
-griffon-21:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/35
-    ib0:
-      hwid: '0xC9030003304E'
-      line_card: '0x000b8cffff003101'
-      position: 1
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/35
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 23
-griffon-22:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/36
-    ib0:
-      hwid: '0xC90300033032'
-      line_card: '0x000b8cffff003101'
-      position: 3
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/36
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 21
-griffon-23:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/37
-    ib0:
-      hwid: '0xC9030003302F'
-      line_card: '0x000b8cffff003101'
-      position: 4
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/O/37
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 20
-griffon-24:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/38
-    ib0:
-      hwid: '0xC90300032FD6'
-      line_card: '0x000b8cffff003101'
-      position: 5
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/38
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 19
-griffon-25:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/39
-    ib0:
-      hwid: '0xC90300033022'
-      line_card: '0x000b8cffff003101'
-      position: 6
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/39
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 18
-griffon-26:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/40
-    ib0:
-      hwid: '0xC90300032FD2'
-      line_card: '0x000b8cffff003101'
-      position: 7
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/40
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 17
-griffon-27:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/41
-    ib0:
-      hwid: '0xC9030003301E'
-      line_card: '0x000b8cffff003101'
-      position: 8
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/41
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 15
-griffon-28:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/42
-    ib0:
-      hwid: '0xC90300032FDA'
-      line_card: '0x000b8cffff003101'
-      position: 9
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/42
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 14
-griffon-29:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/43
-    ib0:
-      hwid: '0xC90300033042'
-      line_card: '0x000b8cffff003101'
-      position: 10
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/43
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 13
-griffon-30:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/1
-    ib0:
-      hwid: '0xC9030003303A'
-      line_card: '0x000b8cffff003055'
-      position: 1
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/1
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 1
-griffon-31:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/2
-    ib0:
-      hwid: '0xC9030003305E'
-      line_card: '0x000b8cffff003055'
-      position: 2
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/2
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 2
-griffon-32:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/3
-    ib0:
-      hwid: '0xC9030003305A'
-      line_card: '0x000b8cffff003055'
-      position: 3
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/3
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 3
-griffon-33:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/4
-    ib0:
-      hwid: '0xC90300033056'
-      line_card: '0x000b8cffff003055'
-      position: 4
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 4
-griffon-34:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/5
-    ib0:
-      hwid: '0xC90300033052'
-      line_card: '0x000b8cffff003055'
-      position: 5
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 5
-griffon-35:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/6
-    ib0:
-      hwid: '0xC9030003304A'
-      line_card: '0x000b8cffff003055'
-      position: 6
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 6
-griffon-36:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/7
-    ib0:
-      hwid: '0xC9030003301A'
-      line_card: '0x000b8cffff003055'
-      position: 1/0/7
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 7
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 7
-griffon-37:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/8
-    ib0:
-      hwid: '0xC90300028058'
-      line_card: '0x000b8cffff003055'
-      position: 8
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 8
-griffon-38:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/9
-    ib0:
-      hwid: '0xC903000318DC'
-      line_card: '0x000b8cffff003055'
-      position: 9
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 2
-griffon-39:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/25
-    ib0:
-      hwid: '0xC903000318E8'
-      line_card: '0x000b8cffff003055'
-      position: 10
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 3
-griffon-40:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/26
-    ib0:
-      hwid: '0xC90300031780'
-      line_card: '0x000b8cffff003055'
-      position: 11
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 4
-griffon-41:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/27
-    ib0:
-      hwid: '0xC903000317D4'
-      line_card: '0x000b8cffff003055'
-      position: 12
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 5
-griffon-42:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/28
-    ib0:
-      hwid: '0xC903000280D0'
-      line_card: '0x000b8cffff0030ff'
-      position: 1
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 6
-griffon-43:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/29
-    ib0:
-      hwid: '0xC903000280B8'
-      line_card: '0x000b8cffff0030ff'
-      position: 2
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 7
-griffon-44:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/30
-    ib0:
-      hwid: '0xC903000280D4'
-      line_card: '0x000b8cffff0030ff'
-      position: 3
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 17
-griffon-45:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/31
-    ib0:
-      hwid: '0xC903000280B0'
-      line_card: '0x000b8cffff0030ff'
-      position: 4
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 18
-griffon-46:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/32
-    ib0:
-      hwid: '0xC903000280A8'
-      line_card: '0x000b8cffff0030ff'
-      position: 5
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 19
-griffon-47:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/33
-    ib0:
-      hwid: '0xC903000318E0'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 20
-griffon-48:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/34
-    ib0:
-      hwid: '0xC903000317A4'
-      line_card: '0x000b8cffff0030ff'
-      position: 7
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 21
-griffon-49:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/35
-    ib0:
-      hwid: '0xC90300033026'
-      line_card: '0x000b8cffff0030ff'
-      position: 8
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/35
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 22
-griffon-50:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/37
-    ib0:
-      hwid: '0xC903000318D0'
-      line_card: '0x000b8cffff0030ff'
-      position: 9
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/36
-  pdu:
-    pdu_name: griffon-pdu3
-    pdu_position: 23
-griffon-51:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/36
-    ib0:
-      hwid: '0xC903000318EC'
-      line_card: '0x000b8cffff0030ff'
-      position: 10
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/37
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 21
-griffon-52:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/38
-    ib0:
-      hwid: '0xC90300027F84'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/38
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 20
-griffon-53:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/39
-    ib0:
-      hwid: '0xC903000280C4'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/39
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 19
-griffon-54:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/40
-    ib0:
-      hwid: '0xC903000318C4'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/40
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 18
-griffon-55:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/41
-    ib0:
-      hwid: '0xC90300031784'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/41
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 17
-griffon-56:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/42
-    ib0:
-      hwid: '0xC9030003176C'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/42
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 15
-griffon-57:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon2
-      switch_port: Gi1/0/43
-    ib0:
-      hwid: '0xC9030003173C'
-    bmc:
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/43
-  pdu:
-    pdu_name: griffon-pdu4
-    pdu_position: 14
-griffon-58:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/11
-    ib0:
-      hwid: '0xC9030003179C'
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/12
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 1
-griffon-59:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/12
-    ib0:
-      hwid: '0xC90300031730'
-      line_card: '0x000b8cffff00304d'
-      position: 5
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/11
-  pdu:
-    pdu_name: griffon-pdu1
-    pdu_position: 2
-griffon-60:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon1
-      switch_port: Gi1/0/13
-    ib0:
-      hwid: '0xC90300031740'
-      line_card: '0x000b8cffff00304d'
-      position: 6
-    bmc:
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/13
-  pdu:
-    pdu_name: griffon-pdu2
-    pdu_position: 5
-griffon-61:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/4
-    ib0:
-      hwid: '0xC90300031804'
-      line_card: '0x000b8cffff00304d'
-      position: 7
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/4
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 3
-griffon-62:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/5
-    ib0:
-      hwid: '0xC9030003185C'
-      line_card: '0x000b8cffff00304d'
-      position: 8
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/5
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 2
-griffon-63:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/6
-    ib0:
-      hwid: '0xC903000317B4'
-      line_card: '0x000b8cffff00304d'
-      position: 9
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/6
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 1
-griffon-64:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/7
-    ib0:
-      hwid: '0xC90300033012'
-      line_card: '0x000b8cffff00304d'
-      position: 10
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/7
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 8
-griffon-65:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/8
-    ib0:
-      hwid: '0xC90300031750'
-      line_card: '0x000b8cffff00304d'
-      position: 11
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/8
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 2
-griffon-66:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/9
-    ib0:
-      hwid: '0xC90300031968'
-      line_card: '0x000b8cffff00304d'
-      position: 12
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/9
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 3
-griffon-67:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/10
-    ib0:
-      hwid: '0xC903000317DC'
-      line_card: '0x000b8cffff003107'
-      position: 1
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/10
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 4
-griffon-68:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/11
-    ib0:
-      hwid: '0xC90300031858'
-      line_card: '0x000b8cffff003107'
-      position: 2
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/11
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 5
-griffon-69:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/12
-    ib0:
-      hwid: '0xC903000317B0'
-      line_card: '0x000b8cffff003107'
-      position: 3
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/12
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 6
-griffon-70:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/13
-    ib0:
-      hwid: '0xC90300031810'
-      line_card: '0x000b8cffff003107'
-      position: 4
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/13
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 7
-griffon-71:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/14
-    ib0:
-      hwid: '0xC90300031824'
-      line_card: '0x000b8cffff003107'
-      position: 5
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/14
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 8
-griffon-72:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/15
-    ib0:
-      hwid: '0xC90300032FCE'
-      line_card: '0x000b8cffff003107'
-      position: 6
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/15
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 9
-griffon-73:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/25
-    ib0:
-      hwid: '0xC903000319FC'
-      line_card: '0x000b8cffff003107'
-      position: 7
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/25
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 10
-griffon-74:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/26
-    ib0:
-      hwid: '0xC90300031890'
-      line_card: '0x000b8cffff003107'
-      position: 8
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/26
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 11
-griffon-75:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/27
-    ib0:
-      hwid: '0xC90300031874'
-      line_card: '0x000b8cffff003107'
-      position: 9
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/27
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 13
-griffon-76:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/28
-    ib0:
-      hwid: '0xC90300031974'
-      line_card: '0x000b8cffff003107'
-      position: 10
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/28
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 14
-griffon-77:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/29
-    ib0:
-      hwid: '0xC903000318B8'
-      line_card: '0x000b8cffff003107'
-      position: 11
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/29
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 15
-griffon-78:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/30
-    ib0:
-      hwid: '0xC903000317AC'
-      line_card: '0x000b8cffff003107'
-      position: 12
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/30
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 17
-griffon-79:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/31
-    ib0:
-      hwid: '0xC90300031808'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/31
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 18
-griffon-80:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/32
-    ib0:
-      hwid: '0xC90300031800'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/32
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 19
-griffon-81:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/33
-    ib0:
-      hwid: '0xC90300031860'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/33
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 20
-griffon-82:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/34
-    ib0:
-      hwid: '0xC903000319F8'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/34
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 21
-griffon-83:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/35
-    ib0:
-      hwid: '0xC903000319F4'
-      line_card: '0x000b8cffff003101'
-      position: 12
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/35
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 22
-griffon-84:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/36
-    ib0:
-      hwid: '0xC9030003180C'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/36
-  pdu:
-    pdu_name: griffon-pdu5
-    pdu_position: 23
-griffon-85:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/37
-    ib0:
-      hwid: '0xC903000319F0'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/37
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 21
-griffon-86:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/38
-    ib0:
-      hwid: '0xC90300031A00'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/39
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 20
-griffon-87:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/39
-    ib0:
-      hwid: '0xC90300031A04'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/40
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 19
-griffon-88:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/40
-    ib0:
-      hwid: '0xC90300031A18'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/41
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 18
-griffon-89:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/41
-    ib0:
-      hwid: '0xC90300031A64'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/42
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 17
-griffon-90:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/42
-    ib0:
-      hwid: '0xC90300031A20'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/43
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 15
-griffon-91:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/43
-    ib0:
-      hwid: '0xC90300031A0C'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/44
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 14
-griffon-92:
-  network_interfaces:
-    eth0:
-      switch_name: sgriffon3
-      switch_port: Gi1/0/44
-    ib0:
-      hwid: '0xC90300031A08'
-    bmc:
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/45
-  pdu:
-    pdu_name: griffon-pdu6
-    pdu_position: 13
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
deleted file mode 100644
index 59d1a55226..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-1:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.1
-      mac: 00:e0:81:4f:e3:13
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.1
-      ip6: fe80::2e0:81ff:feb2:c188
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:88
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:89
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.1
-      ip6: fe80::202:c903:3:18f1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530006
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-10.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
deleted file mode 100644
index 0010df1c5c..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-10.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-10:
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.10
-      ip6: fe80::2e0:81ff:feb2:c0a4
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:a4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:a5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.10
-      ip6: fe80::202:c903:2:7f59
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:59
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:5a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.10
-      mac: 00:e0:81:4f:ca:9e
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530015
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-11.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
deleted file mode 100644
index 81e14b402c..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-11:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.11
-      mac: 00:e0:81:4f:e3:70
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.11
-      ip6: fe80::2e0:81ff:feb2:c24c
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:4c
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:4d
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.11
-      ip6: fe80::202:c903:2:80d9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:da
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530016
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-12.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
deleted file mode 100644
index 2832fb5936..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-12:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.12
-      mac: 00:e0:81:4f:ca:8b
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.12
-      ip6: fe80::2e0:81ff:feb2:c19e
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:9e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:9f
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.12
-      ip6: fe80::202:c903:2:80dd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:de
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  chassis:
-    serial_number: 812530017
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-13.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
deleted file mode 100644
index 076e790518..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-13.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-13:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.13
-      mac: 00:e0:81:4f:e2:d4
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.13
-      ip6: fe80::2e0:81ff:feb2:c1e4
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:e4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:e5
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.13
-      ip6: fe80::202:c903:2:80bd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:bd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:be
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530018
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
deleted file mode 100644
index c6f3f6ab32..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-14:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.14
-      mac: 00:e0:81:4f:e2:c5
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.14
-      ip6: fe80::2e0:81ff:feb1:c060
-      driver: e1000e
-      mac: 00:e0:81:b1:c0:60
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b1:c0:61
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.14
-      ip6: fe80::202:c903:2:80cd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ce
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530019
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
deleted file mode 100644
index 7281806079..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-15:
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.15
-      ip6: fe80::2e0:81ff:feb2:c4c4
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:c4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:c5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.15
-      ip6: fe80::202:c903:2:80b5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.15
-      mac: 00:e0:81:4f:e3:87
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530020
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-16.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
deleted file mode 100644
index 384b406503..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-16:
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.16
-      mac: 00:e0:81:4f:e2:d8
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.16
-      ip6: fe80::2e0:81ff:feb2:bfa0
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:a0
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:a1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.16
-      ip6: fe80::202:c903:3:303f
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3f
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:40
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530021
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
deleted file mode 100644
index f7e64d93c1..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-17:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.17
-      mac: 00:e0:81:4f:e3:6a
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.17
-      ip6: fe80::2e0:81ff:feb2:c218
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:18
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:19
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.17
-      ip6: fe80::202:c903:3:3017
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:18
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530022
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
deleted file mode 100644
index 52629853c2..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-18:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.18
-      ip6: fe80::2e0:81ff:feb2:c204
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:04
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:05
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.18
-      ip6: fe80::202:c903:3:302b
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2c
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.18
-      mac: 00:e0:81:4f:cb:0e
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530023
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
deleted file mode 100644
index e07fbfb1bc..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-19:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.19
-      mac: 00:e0:81:4f:e3:00
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.19
-      ip6: fe80::2e0:81ff:feb2:c560
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:60
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:61
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.19
-      ip6: fe80::202:c903:3:3037
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:38
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530024
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
deleted file mode 100644
index a2773c672d..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-2:
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.2
-      ip6: fe80::2e0:81ff:feb2:c4bc
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:bc
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:bd
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.2
-      ip6: fe80::202:c903:2:8065
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:66
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.2
-      mac: 00:e0:81:4f:e2:fc
-  chassis:
-    serial_number: 812530007
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-20.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
deleted file mode 100644
index f472b59464..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-20.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-20:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.20
-      mac: 00:e0:81:4f:ca:8e
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.20
-      ip6: fe80::2e0:81ff:feb2:c574
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:74
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:75
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.20
-      ip6: fe80::202:c903:3:2fcb
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cb
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cc
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530025
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-21.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
deleted file mode 100644
index ffe94fc70a..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-21.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-21:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.21
-      mac: 00:e0:81:4f:e2:fb
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.21
-      ip6: fe80::2e0:81ff:feb2:bfc2
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:c2
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:c3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.21
-      ip6: fe80::202:c903:3:304f
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:50
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530026
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
deleted file mode 100644
index 5e7e346487..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-22:
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.22
-      mac: 00:e0:81:4f:cb:02
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.22
-      ip6: fe80::2e0:81ff:feb2:bfa6
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:a6
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:a7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.22
-      ip6: fe80::202:c903:3:3033
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:34
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530027
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
deleted file mode 100644
index 54cbfe64d4..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-23:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.23
-      mac: 00:e0:81:4f:ca:7e
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.23
-      ip6: fe80::2e0:81ff:feb2:c156
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:56
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:57
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.23
-      ip6: fe80::202:c903:3:302f
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:30
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530028
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-24.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
deleted file mode 100644
index 0d61d21b87..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-24.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-24:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.24
-      mac: 00:e0:81:4f:ca:7f
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.24
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:2e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:2f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.24
-      ip6: fe80::202:c903:3:2fd7
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d7
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d8
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530029
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
deleted file mode 100644
index 686273a2b7..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-25:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.25
-      mac: 00:e0:81:4f:e3:ba
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.25
-      ip6: fe80::2e0:81ff:feb2:bfe2
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:e2
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:e3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.25
-      ip6: fe80::202:c903:3:3023
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:24
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530030
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-26.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
deleted file mode 100644
index 915d8be000..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-26:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.26
-      mac: 00:e0:81:4f:b5:da
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.26
-      ip6: fe80::2e0:81ff:feb2:c1c8
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:c8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:c9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.26
-      ip6: fe80::202:c903:3:2fd3
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d3
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d4
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530031
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-27.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
deleted file mode 100644
index 5e2188ee0a..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-27:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.27
-      mac: 00:e0:81:4f:e2:cb
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.27
-      ip6: fe80::2e0:81ff:feb2:c0c4
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:c4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:c5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.27
-      ip6: fe80::202:c903:3:301f
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1f
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:20
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530032
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-28.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
deleted file mode 100644
index 8fb3b9f1fa..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-28:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.28
-      mac: 00:e0:81:4f:ca:8d
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.28
-      ip6: fe80::2e0:81ff:feb2:c05e
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:5e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:5f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.28
-      ip6: fe80::202:c903:3:2fdb
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:db
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:dc
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530033
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
deleted file mode 100644
index 80b1bf1864..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-29:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.29
-      mac: 00:e0:81:4f:e3:71
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.29
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:b0
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:b1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.29
-      ip6: fe80::202:c903:3:3043
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:44
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530034
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-3.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
deleted file mode 100644
index 3dd1e56cd5..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-3.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-3:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.3
-      mac: 00:e0:81:4f:cb:0a
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.3
-      ip6: fe80::2e0:81ff:feb2:c1fe
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:fe
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:ff
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.3
-      ip6: fe80::202:c903:2:7f61
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:bd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:be
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530008
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-30.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
deleted file mode 100644
index 0303c1cebc..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-30.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-30:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.30
-      mac: 00:e0:81:4f:e3:10
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.30
-      ip6: fe80::2e0:81ff:feb2:c0b4
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:b4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:b5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.30
-      ip6: fe80::202:c903:3:303b
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3b
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3c
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530035
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-31.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
deleted file mode 100644
index f8eccd646c..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-31.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-31:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.31
-      ip6: fe80::2e0:81ff:feb2:c224
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:24
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:25
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.31
-      ip6: fe80::202:c903:3:305f
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5f
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:60
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.31
-      mac: 00:e0:81:4f:cb:03
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530036
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-32.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
deleted file mode 100644
index 2d47654d4b..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-32.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-32:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.32
-      mac: 00:e0:81:4f:e3:8b
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.32
-      ip6: fe80::2e0:81ff:feb2:c59e
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:9e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:9f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.32
-      ip6: fe80::202:c903:3:305b
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5b
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5c
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530037
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-33.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
deleted file mode 100644
index e232c01783..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-33.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-33:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.33
-      ip6: fe80::2e0:81ff:feb2:bffa
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:fa
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:fb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.33
-      ip6: fe80::202:c903:3:3057
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:57
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:58
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.33
-      mac: 00:e0:81:4f:ca:7a
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530038
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-34.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
deleted file mode 100644
index ce9021970c..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-34.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-34:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.34
-      mac: 00:e0:81:4f:cb:20
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.34
-      ip6: fe80::2e0:81ff:feb2:54d6
-      driver: e1000e
-      mac: 00:e0:81:b2:54:d6
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:54:d7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.34
-      ip6: fe80::202:c903:3:3053
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:53
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:54
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530039
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-35.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
deleted file mode 100644
index 73b4b8fd74..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-35.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-35:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.35
-      ip6: fe80::2e0:81ff:feb2:c4d4
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:d4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:d5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.35
-      ip6: fe80::202:c903:3:304b
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4b
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4c
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.35
-      mac: 00:e0:81:4f:b5:ea
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530040
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-36.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
deleted file mode 100644
index 5b5d962b3f..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-36.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-36:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.36
-      mac: 00:e0:81:4f:b5:e8
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.36
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:be
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:bf
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.36
-      ip6: fe80::202:c903:2:8055
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1b
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1c
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530041
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-37.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
deleted file mode 100644
index 41be01cc8f..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-37.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-37:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.37
-      mac: 00:e0:81:4f:e2:d7
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.37
-      ip6: fe80::2e0:81ff:feb2:c03e
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:3e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:3f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.37
-      ip6: fe80::202:c903:2:8059
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:59
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530042
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-38.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
deleted file mode 100644
index 1f6c77e6c0..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-38.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-38:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.38
-      mac: 00:e0:81:4f:e3:68
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.38
-      ip6: fe80::2e0:81ff:feb2:c1d8
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:d8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:d9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.38
-      ip6: fe80::202:c903:3:18dd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:dd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:de
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530043
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-39.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
deleted file mode 100644
index ff6b66ddf5..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-39.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-39:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.39
-      ip6: fe80::2e0:81ff:feb2:c1fa
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:fa
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:fb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.39
-      ip6: fe80::202:c903:3:18e9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ea
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.39
-      mac: 00:e0:81:4f:e2:bf
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530044
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
deleted file mode 100644
index 759b296e9d..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-4:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.4
-      mac: 00:e0:81:4f:e3:7a
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.4
-      ip6: fe80::2e0:81ff:feb2:bfe4
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:e4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:e5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.4
-      ip6: fe80::202:c903:2:8069
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:6a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530009
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-40.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
deleted file mode 100644
index 919f53f3c5..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-40.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-40:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.40
-      mac: 00:e0:81:4f:e2:c6
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.40
-      ip6: fe80::2e0:81ff:feb2:c0cc
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:cc
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:cd
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.40
-      ip6: fe80::202:c903:3:1781
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:81
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:82
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530045
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-41.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
deleted file mode 100644
index 595af96e24..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-41.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-41:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.41
-      mac: 00:e0:81:4f:b5:e1
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.41
-      ip6: fe80::2e0:81ff:feb2:c498
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:98
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:99
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.41
-      ip6: fe80::202:c903:3:17d5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530046
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-42.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
deleted file mode 100644
index e4907b22a8..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-42.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-42:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.42
-      mac: 00:e0:81:4f:e3:65
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.42
-      ip6: fe80::2e0:81ff:feb2:c1ba
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:ba
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:bb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.42
-      ip6: fe80::202:c903:2:80d1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530047
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-43.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
deleted file mode 100644
index 32a833c747..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-43.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-43:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.43
-      mac: 00:e0:81:4f:b5:e4
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.43
-      ip6: fe80::2e0:81ff:feb2:c1f4
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:f4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:f5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.43
-      ip6: fe80::202:c903:2:80b9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ba
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530048
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-44.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
deleted file mode 100644
index 353843f57a..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-44.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-44:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.44
-      mac: 00:e0:81:4f:e2:b7
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.44
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:b8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:b9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.44
-      ip6: fe80::202:c903:2:80d5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530049
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-45.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
deleted file mode 100644
index 21b8a396b7..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-45.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-45:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.45
-      mac: 00:e0:81:4f:e2:c4
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.45
-      ip6: fe80::2e0:81ff:feb2:c494
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:94
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:95
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.45
-      ip6: fe80::202:c903:2:80b1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530050
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-46.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
deleted file mode 100644
index 3ebce17e4d..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-46.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-46:
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.46
-      mac: 00:e0:81:4f:ca:79
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.46
-      ip6: fe80::2e0:81ff:feb1:c436
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:36
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:37
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.46
-      ip6: fe80::202:c903:2:80a9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:a9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:aa
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530051
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-47.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
deleted file mode 100644
index e7967fb42f..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-47.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-47:
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.47
-      ip6: fe80::2e0:81ff:feb1:c4cc
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:cc
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:cd
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.47
-      ip6: fe80::202:c903:3:18e1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.47
-      mac: 00:e0:81:4f:e3:0a
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530052
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-48.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
deleted file mode 100644
index d3219c35ce..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-48.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-48:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.48
-      mac: 00:e0:81:4f:ca:80
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.48
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:8c
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:8d
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.48
-      ip6: fe80::202:c903:3:17a5 
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530053
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-49.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
deleted file mode 100644
index 5c49c264f0..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-49.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-49:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.49
-      mac: 00:e0:81:4f:e2:c9
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.49
-      ip6: fe80::2e0:81ff:feb2:c22c
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:2c
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:2d
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.49
-      ip6: fe80::202:c903:3:3027
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:27
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:28
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530054
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
deleted file mode 100644
index 79e1a61892..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-5:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.5
-      mac: 00:e0:81:4f:e3:8d
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.5
-      ip6: fe80::2e0:81ff:feb2:c1fc
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:fc
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:fd
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.5
-      ip6: fe80::202:c903:2:80c1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530010
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-50.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
deleted file mode 100644
index 97be13dd3c..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-50.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-50:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.50
-      mac: 00:e0:81:4f:e2:fa
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.50
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:10
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:11
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.50
-      ip6: fe80::202:c903:3:18d1 
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530055
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-51.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
deleted file mode 100644
index 230ef71099..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-51.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-51:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.51
-      mac: 00:e0:81:4f:e3:92
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.51
-      ip6: fe80::2e0:81ff:feb2:c09e
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:9e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:9f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.51
-      ip6: fe80::202:c903:3:18ed
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ed
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ee
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530056
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-52.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
deleted file mode 100644
index 88b19034ce..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-52.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-52:
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.52
-      mac: 00:e0:81:4f:e3:7e
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.52
-      ip6: fe80::2e0:81ff:feb2:c4a8
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:a8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:a9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.52
-      ip6: fe80::202:c903:2:7f85
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:85
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:86
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530057
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-53.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
deleted file mode 100644
index 5f91105307..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-53.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-53:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.53
-      ip6: fe80::2e0:81ff:feb2:c030
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:30
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:31
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.53
-      ip6: fe80::202:c903:2:80c5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.53
-      mac: 00:e0:81:4f:e3:56
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530058
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-54.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
deleted file mode 100644
index facef52057..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-54.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-54:
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.54
-      mac: 00:e0:81:4f:e2:cf
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.54
-      ip6: fe80::2e0:81ff:feb2:c0da
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:da
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:db
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.54
-      ip6: fe80::202:c903:4:5205
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:05
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:06
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530059c
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-55.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
deleted file mode 100644
index f5dfe083a6..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-55.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-55:
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.55
-      ip6: fe80::2e0:81ff:feb2:c288
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:88
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:89
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.55
-      ip6: fe80::202:c903:3:1785
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:85
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:86
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.55
-      mac: 00:e0:81:4f:e2:f8
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530060
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-56.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
deleted file mode 100644
index 6b60eb514b..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-56.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-56:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.56
-      mac: 00:e0:81:4f:ca:89
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.56
-      ip6: fe80::2e0:81ff:feb2:c1dc
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:dc
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:dd
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.56
-      ip6: fe80::202:c903:3:176d
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6d
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530061
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-57.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
deleted file mode 100644
index 25e6b13336..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-57.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-57:
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.57
-      ip6: fe80::2e0:81ff:feb2:bfec
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:ec
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:ed
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.57
-      ip6: fe80::202:c903:3:173d
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3d
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.57
-      mac: 00:e0:81:4f:e2:de
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530062
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
deleted file mode 100644
index dbbaba3ce4..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-58:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.58
-      mac: 00:e0:81:4f:e2:f3
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.58
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:28
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:29
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.58
-      ip6: fe80::202:c903:3:179d 
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530063
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-59.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
deleted file mode 100644
index bd51590ca6..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-59:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.59
-      mac: 00:e0:81:4f:e3:05
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.59
-      ip6: fe80::2e0:81ff:feb2:c1f8
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:f8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:f9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.59
-      ip6: fe80::202:c903:3:1731
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:32
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530064
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-6.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
deleted file mode 100644
index 5ec18f85ff..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-6.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-6:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.6
-      mac: 00:e0:81:4f:e3:74
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.6
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:7e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:7f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.6
-      ip6: fe80::202:c903:2:80ad
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ae
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530011
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
deleted file mode 100644
index e42b1d0c84..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-60:
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.60
-      ip6: fe80::2e0:81ff:feb2:bff4
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:f4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:f5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.60
-      ip6: fe80::202:c903:3:1741
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:42
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.60
-      mac: 00:e0:81:4f:e3:90
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530065
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-61.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
deleted file mode 100644
index d96accf03d..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-61.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-61:
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.61
-      ip6: fe80::2e0:81ff:feb2:c1e2
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:e2
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:e3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.61
-      ip6: fe80::202:c903:3:1805
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:05
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:06
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.61
-      mac: 00:e0:81:4b:fc:d2
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530066
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-62.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
deleted file mode 100644
index 60faa23e9c..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-62.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-62:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.62
-      mac: 00:e0:81:4f:e2:b8
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.62
-      ip6: fe80::2e0:81ff:feb2:c1d6
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:d6
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:d7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.62
-      ip6: fe80::202:c903:3:185d
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5d
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530067
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-63.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
deleted file mode 100644
index 9228901bbc..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-63.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-63:
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDS72103 
-      rev: JPFO
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.63
-      ip6: fe80::2e0:81ff:feb1:c384
-      driver: e1000e
-      mac: 00:e0:81:b1:c3:84
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b1:c3:85
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.63
-      ip6: fe80::202:c903:3:17b5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.63
-      mac: 00:e0:81:4f:e3:0b
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530068
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-64.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
deleted file mode 100644
index 13a1096eab..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-64.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-64:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.64
-      mac: 00:e0:81:4f:e2:cd
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.64
-      ip6: fe80::2e0:81ff:feb2:c248
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:48
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:49
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.64
-      ip6: fe80::202:c903:3:3013
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:13
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:14
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530069
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-65.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
deleted file mode 100644
index a42c71a19e..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-65.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-65:
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.65
-      ip6: fe80::2e0:81ff:feb1:c4d4
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:d4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b1:c4:d5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.65
-      ip6: fe80::202:c903:3:1751
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:51
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:52
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.65
-      mac: 00:e0:81:4f:e2:bc
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530070
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-66.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
deleted file mode 100644
index 3a2dfd610d..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-66.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-66:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.66
-      ip6: fe80::2e0:81ff:feb2:c02e
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:2e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:2f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.66
-      ip6: fe80::202:c903:3:1969
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:69
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:6a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.66
-      mac: 00:e0:81:4f:ca:78
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530071
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-67.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
deleted file mode 100644
index b6eb4a0378..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-67.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-67:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.67
-      mac: 00:e0:81:4f:b5:f0
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.67
-      ip6: fe80::2e0:81ff:feb2:bff2
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:f2
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:f3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.67
-      ip6: fe80::202:c903:3:17dd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:dd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:de
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530072
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-68.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
deleted file mode 100644
index 1e4669009f..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-68.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-68:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.68
-      ip6: fe80::2e0:81ff:feb2:c170
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:70
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:71
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.68
-      ip6: fe80::202:c903:3:1859
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:59
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.68
-      mac: 00:e0:81:4f:ca:8f
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530073
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-69.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
deleted file mode 100644
index 0c5ff68550..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-69.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-69:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.69
-      mac: 00:e0:81:4f:b5:dc
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.69
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:3a
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:3b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.69
-      ip6: fe80::202:c903:3:17b1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530074
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
deleted file mode 100644
index 5e1301423b..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-7:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.7
-      mac: 00:e0:81:4f:ca:90
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.7
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:ac
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:ad
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.7
-      ip6: fe80::202:c903:2:8055
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:56
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530012
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-70.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
deleted file mode 100644
index c1ee179041..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-70.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-70:
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.70
-      ip6: fe80::2e0:81ff:feb2:bf8a
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:8a
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:8b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.70
-      ip6: fe80::202:c903:3:1811
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:11
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:12
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.70
-      mac: 00:e0:81:4f:ca:77
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530075
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-71.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
deleted file mode 100644
index 4fbc4d6962..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-71.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-71:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.71
-      ip6: fe80::2e0:81ff:feb2:bfce
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:ce
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:cf
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.71
-      ip6: fe80::202:c903:3:1825
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:25
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:26
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.71
-      mac: 00:e0:81:4f:cb:05
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530076
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-72.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
deleted file mode 100644
index 15147226f6..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-72.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-72:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.72
-      mac: 00:e0:81:4f:b5:f1
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.72
-      ip6: fe80::2e0:81ff:feb2:c4d6
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:d6
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:d7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.72
-      ip6: fe80::202:c903:3:2fcf
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cf
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d0
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530077
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-73.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
deleted file mode 100644
index 5ebc06ba21..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-73.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-73:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.73
-      mac: 00:e0:81:4f:cb:0d
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.73
-      ip6: fe80::2e0:81ff:feb2:c4ba
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:ba
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:bb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.73
-      ip6: fe80::202:c903:3:19fd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fd
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fe
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530078
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-74.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
deleted file mode 100644
index 1b32344c85..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-74.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-74:
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.74
-      mac: 00:e0:81:4f:cb:00
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.74
-      ip6: fe80::2e0:81ff:feb2:c094
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:94
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:95
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.74
-      ip6: fe80::202:c903:3:1891
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:91
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:92
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530079
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-75.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
deleted file mode 100644
index 4581b56e2f..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-75.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-75:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.75
-      mac: 00:e0:81:4f:e3:75
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.75
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:d2
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:d3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.75
-      ip6: fe80::202:c903:3:1875
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:75
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:76
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530080
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-76.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
deleted file mode 100644
index c811c509ff..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-76.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-76:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.76
-      mac: 00:e0:81:4f:b5:e3
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.76
-      ip6: fe80::2e0:81ff:feb2:c124
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:24
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:25
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.76
-      ip6: fe80::202:c903:3:1975
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:75
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:76
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530081
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-77.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
deleted file mode 100644
index bc04fa16de..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-77.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-77:
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.77
-      ip6: fe80::2e0:81ff:feb2:bff0
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:f0
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:f1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.77
-      ip6: fe80::202:c903:3:18b9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:b9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ba
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.77
-      mac: 00:e0:81:4f:e2:e0
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530082
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-78.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
deleted file mode 100644
index df2b913d62..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-78.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-78:
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.78
-      mac: 00:e0:81:4f:e2:e8
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.78
-      ip6: fe80::2e0:81ff:feb2:c244
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:44
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:45
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.78
-      ip6: fe80::202:c903:3:17ad
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ad
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ae
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530083
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-79.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
deleted file mode 100644
index 78e29cbb55..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-79.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-79:
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.79
-      ip6: fe80::2e0:81ff:feb2:c4b8
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:b8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:b9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.79
-      ip6: fe80::202:c903:3:1809
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:09
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.79
-      mac: 00:e0:81:4f:e2:b2
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530084
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
deleted file mode 100644
index 2e36074dee..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-8:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.8
-      mac: 00:e0:81:4f:e3:c2
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.8
-      ip6: fe80::2e0:81ff:feb2:c4a0
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:a0
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:a1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.8
-      ip6: fe80::202:c903:2:80c9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ca
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial_number: 812530013
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-80.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
deleted file mode 100644
index 0431d6ec55..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-80.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-80:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.80
-      ip6: fe80::2e0:81ff:feb2:c1f6
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:f6
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:f7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.80
-      ip6: fe80::202:c903:3:1801
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:01
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:02
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.80
-      mac: 00:e0:81:4f:b5:af
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530085
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-81.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
deleted file mode 100644
index cf43678541..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-81.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-81:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.81
-      mac: 00:e0:81:4f:ca:7d
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.81
-      ip6: fe80::2e0:81ff:feb2:c572
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:72
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:73
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.81
-      ip6: fe80::202:c903:3:1861
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:61
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:62
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530086
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-82.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
deleted file mode 100644
index 8e90ee54c3..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-82.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-82:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.82
-      mac: 00:e0:81:4f:cb:08
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.82
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:7e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c1:7f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.82
-      ip6: fe80::202:c903:3:19f9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f9
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fa
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530087
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-83.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
deleted file mode 100644
index 965cfcc62a..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-83.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-83:
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.83
-      mac: 00:e0:81:4f:ca:9f
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.83
-      ip6: fe80::2e0:81ff:feb2:c240
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:40
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:41
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.83
-      ip6: fe80::202:c903:3:19f5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f5
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial_number: 812530088
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-84.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
deleted file mode 100644
index 7d5d991d21..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-84.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-84:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.84
-      mac: 00:e0:81:4f:e2:d9
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.84
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:4e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:4f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.84
-      ip6: fe80::202:c903:3:180d 
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0d
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009 
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530089
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-85.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
deleted file mode 100644
index df68d8e4d8..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-85.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-85:
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.85
-      ip6: fe80::2e0:81ff:feb2:c5bc
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:bc
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:bd
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.85
-      ip6: fe80::202:c903:3:19f1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f1
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.85
-      mac: 00:e0:81:4f:b5:e7
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530090
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-86.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
deleted file mode 100644
index a4da253f25..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-86.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-86:
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.86
-      mac: 00:e0:81:4f:cb:0f
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.86
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:3a
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c2:3b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.86
-      ip6: fe80::202:c903:2:8055
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:01
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:02
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial_number: 812530091
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-87.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
deleted file mode 100644
index 5b6d99f3d0..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-87.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-87:
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.87
-      ip6: fe80::2e0:81ff:feb2:bf82
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:82
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:83
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.87
-      ip6: fe80::202:c903:3:1a05
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:05
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:06
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.87
-      mac: 00:e0:81:4f:e2:bd
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530092
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-88.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
deleted file mode 100644
index 1faa6d8d1b..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-88.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-88:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.88
-      ip6: fe80::2e0:81ff:feb2:c4ce
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:ce
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c4:cf
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.88
-      ip6: fe80::202:c903:3:1a19
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:19
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:1a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.88
-      mac: 00:e0:81:4f:e3:8c
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530093
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-89.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
deleted file mode 100644
index c3b09adce1..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-89.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-89:
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.89
-      mac: 00:e0:81:4f:e3:81
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.89
-      ip6: fe80::2e0:81ff:feb2:c5d4
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:d4
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:d5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.89
-      ip6: fe80::202:c903:3:1a65
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:65
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:66
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530094
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
deleted file mode 100644
index 21e4c948c8..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-9:
-  main_memory:
-    ram_size: 17179869184
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.9
-      mac: 00:e0:81:4f:e2:fe
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.9
-      ip6: fe80::2e0:81ff:feb2:c576
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:76
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c5:77
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.9
-      ip6: fe80::202:c903:2:805d
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial_number: 812530014
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-90.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
deleted file mode 100644
index cff79ebf62..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-90.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-90:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.90
-      ip6: fe80::2e0:81ff:feb2:c046
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:46
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:c0:47
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.90
-      ip6: fe80::202:c903:3:1a21
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:21
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:22
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.90
-      mac: 00:e0:81:4f:ca:fc
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial_number: 812530095
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-91.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
deleted file mode 100644
index b6962cf910..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-91.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-91:
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.91
-      ip6: fe80::2e0:81ff:feb5:8f94
-      driver: e1000e
-      mac: 00:e0:81:b5:8f:94
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b5:8f:95
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.91
-      ip6: fe80::202:c903:0:7b25
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:25
-      rate: 10000000000
-      version: MT25418 
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:26
-      rate: 8000000000
-      version: MT25418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.91
-      mac: 00:e0:81:4f:28:b8
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: ST2O
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 812530096
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-92.yaml b/generators/input/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
deleted file mode 100644
index b489940ae6..0000000000
--- a/generators/input/sites/nancy/clusters/griffon/nodes/griffon-92.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-griffon-92:
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  network_interfaces:
-    bmc:
-      ip: 172.17.65.92
-      mac: 00:e0:81:4f:e3:5d
-    eth0:
-      interface: Ethernet
-      ip: 172.16.65.92
-      ip6: fe80::2e0:81ff:feb2:bfde
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:de
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: e1000e
-      mac: 00:e0:81:b2:bf:df
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.92
-      ip6: fe80::202:c903:3:1a09
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:09
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib1:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:0a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  block_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530097
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
diff --git a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
deleted file mode 100644
index 96d476097d..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
+++ /dev/null
@@ -1,279 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :grimoire do |cluster_uid|
-    model "Dell PowerEdge R630"
-    created_at Time.parse("2016-01-22").httpdate
-    kavlan true
-    queues ['admin', 'default']
-
-    8.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 0.G,
-        :node_flops => 0.G
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :max_walltime => 0,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['admin', 'default']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
-          :release  => "Jessie",
-          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
-          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdd', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdd', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdd', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdd', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sde', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sde', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sde', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sde', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'model'),
-          :vendor     => 'TOSHIBA',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'rev'),
-          :storage    => 'SSD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grimoire', node_uid),
-          :switch_port      => net_port_lookup('nancy', 'grimoire', node_uid),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr"
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grimoire', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('nancy', 'grimoire', node_uid, 'eth1'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grimoire', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('nancy', 'grimoire', node_uid, 'eth2'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grimoire', node_uid, 'eth3'),
-          :switch_port      => net_port_lookup('nancy', 'grimoire', node_uid, 'eth3'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :bridged          => false,
-          :device           => "eth4",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :bridged          => false,
-          :device           => "eth5",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :bridged          => false,
-          :device           => "ib0",
-          :vendor           => 'Mellanox',
-          :model            => 'MT27500 Family [ConnectX-3]',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mac'),
-          :ip               => "172.18.71.#{i+1}",
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :hwid             => lookup('grimoire_manual', node_uid, 'network_interfaces', 'ib0', 'hwid'),
-          :switch           => "sgraoullyib",
-          :ib_switch_card   => lookup('grimoire_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-          :ib_switch_card_pos => lookup('grimoire_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => "172.17.71.#{i+1}",
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => { 
-              :api => { :metric => 'power' },
-              :pdu => [ {
-                :uid => lookup('grimoire_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('grimoire_manual', node_uid, 'pdu', 'pdu_position'),
-              } ]
-            }
-          }
-        })
-
-      end
-    end
-  end # cluster grimoire
-end # nancy
diff --git a/generators/input/sites/nancy/clusters/grimoire/grimoire_manual.yaml b/generators/input/sites/nancy/clusters/grimoire/grimoire_manual.yaml
deleted file mode 100644
index ebaf8ef3a4..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/grimoire_manual.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-grimoire-1:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 17
-grimoire-2:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 17
-grimoire-3:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 18
-grimoire-4:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 18
-grimoire-5:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 19
-grimoire-6:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 19
-grimoire-7:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 20
-grimoire-8:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 20
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
deleted file mode 100644
index d71dde60f7..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-1:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3Z13J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1277
-      timewrite: 2800
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.1
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:c8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:ca
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:35:b8
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:cc
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:cd
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:35:ba
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:31
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
deleted file mode 100644
index 99b0f3dea0..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-2:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3Z0ZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1289
-      timewrite: 2889
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:7c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.2
-      driver: ixgbe
-      mac: 24:6e:96:03:24:78
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:7d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:24:7a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:c4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:c6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:31:51
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
deleted file mode 100644
index 1e63ddccd8..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-3:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3YZYH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1256
-      timewrite: 2713
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:20:f4
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.3
-      driver: ixgbe
-      mac: 24:6e:96:03:20:f0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:20:f5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:20:f2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:38:b4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:38:b6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:30:d1
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
deleted file mode 100644
index cccdf66e11..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-4:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 36ZYH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1305
-      timewrite: 2951
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a7:cc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.4
-      driver: ixgbe
-      mac: 24:6e:96:02:a7:c8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a7:cd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a7:ca
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:a8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:aa
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:91
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
deleted file mode 100644
index 8265fcd64d..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-5:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 36X1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1266
-      timewrite: 2907
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:96:94
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.5
-      driver: ixgbe
-      mac: 24:6e:96:02:96:90
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:96:92
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:ac
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:96:95
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:ae
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:61
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
deleted file mode 100644
index a76044fa29..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-6:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3722J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1310
-      timewrite: 2993
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.6
-      driver: ixgbe
-      mac: 24:6e:96:02:a3:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a3:8a
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:8c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:8d
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:47:5c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:47:5e
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:a1
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
deleted file mode 100644
index 3c285157e3..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-7:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 36Y3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1277
-      timewrite: 2927
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:7c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.7
-      driver: ixgbe
-      mac: 24:6e:96:02:a9:78
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a9:7a
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:7d
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:a4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:a6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:51
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
deleted file mode 100644
index 239f7b5c6b..0000000000
--- a/generators/input/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-grimoire-8:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3703J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1260
-      timewrite: 2870
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:8c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.8
-      driver: ixgbe
-      mac: 24:6e:96:02:a0:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:8d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a0:8a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:54
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:56
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:31
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/grisou.rb b/generators/input/sites/nancy/clusters/grisou/grisou.rb
deleted file mode 100644
index 9373343b02..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/grisou.rb
+++ /dev/null
@@ -1,445 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :grisou do |cluster_uid|
-    model "Dell PowerEdge R630"
-    created_at Time.parse("2016-01-04").httpdate
-    kavlan true
-    queues ['admin', 'default']
-
-    51.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 0.G,
-        :node_flops => 0.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :max_walltime => 0,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['admin', 'default']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
-          :release  => "Jessie",
-          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
-          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        },
-        {
-          :interface  => 'SCSI',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'model'),
-          :vendor     => 'LSI Logic / Symbios Logic',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage    => 'HDD'
-        }]
-        # Nodes with 4 interfaces
-        if (i <= 39) then
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr"
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth1'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth1'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth2'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth2'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid, 'eth3'),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid, 'eth3'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :bridged          => false,
-          :device           => "eth4",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :bridged          => false,
-          :device           => "eth5",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => "172.17.72.#{i+1}",
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-        # Node with 1 interface
-        elsif (i != 49 and i != 50) then
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr"
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :bridged          => false,
-          :device           => "eth4",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :bridged          => false,
-          :device           => "eth5",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => "172.17.72.#{i+1}",
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-        # Nodes with infiniband
-        else
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'grisou', node_uid),
-          :switch_port      => net_port_lookup('nancy', 'grisou', node_uid),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr"
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Intel Corporation',
-          :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 10.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => 'Intel Corporation',
-          :model            => 'Ethernet 10G 2P X520 Adapter',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mounted'),
-          :bridged          => false,
-          :device           => "eth4",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth4', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mounted'),
-          :bridged          => false,
-          :device           => "eth5",
-          :vendor           => 'Intel Corporation',
-          :model            => 'I350 Gigabit Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth5', 'mac'),
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => "172.17.72.#{i+1}",
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :enabled          => true, 
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => true,
-          :mounted          => true,
-          :bridged          => false,
-          :device           => "ib0",
-          :vendor           => 'Mellanox',
-          :model            => 'MT27500 Family [ConnectX-3]',
-          :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mac'),
-          :ip               => "172.18.72.#{i+1}",
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :hwid             => lookup('grisou_manual', node_uid, 'network_interfaces', 'ib0', 'hwid'),
-          :switch           => "sgraoullyib",
-          :ib_switch_card   => lookup('grisou_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
-          :ib_switch_card_pos => lookup('grisou_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
-        },]
-        end
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-        
-        sensors({
-          :power => {
-            :available => true,
-            :via => { 
-              :api => { :metric => 'power' },
-              :pdu => [ {
-                :uid => lookup('grisou_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('grisou_manual', node_uid, 'pdu', 'pdu_position'),
-              } ]
-            }
-          }
-        })
-
-      end
-    end
-  end # cluster grisou
-end # nancy
diff --git a/generators/input/sites/nancy/clusters/grisou/grisou_manual.yaml b/generators/input/sites/nancy/clusters/grisou/grisou_manual.yaml
deleted file mode 100644
index 6cf650e734..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/grisou_manual.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
----
-grisou-1:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 1
-grisou-2:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 1
-grisou-3:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 2
-grisou-4:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 2
-grisou-5:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 3
-grisou-6:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 3
-grisou-7:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 5
-grisou-8:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 4
-grisou-9:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 4
-grisou-10:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 5
-grisou-11:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 6
-grisou-12:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 6
-grisou-13:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 7
-grisou-14:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 7
-grisou-15:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 9
-grisou-16:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 10
-grisou-17:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 10
-grisou-18:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 11
-grisou-19:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 11
-grisou-20:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 12
-grisou-21:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 13
-grisou-22:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 12
-grisou-23:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 14
-grisou-24:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 13
-grisou-25:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 19
-grisou-26:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 14
-grisou-27:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 15
-grisou-28:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 15
-grisou-29:
-  pdu:
-    pdu_name: grisou-pdu1
-    pdu_position: 17
-grisou-30:
-  pdu:
-    pdu_name: grisou-pdu2
-    pdu_position: 17
-grisou-31:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 1
-grisou-32:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 1
-grisou-33:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 2
-grisou-34:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 3
-grisou-35:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 4
-grisou-36:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 5
-grisou-37:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 2
-grisou-38:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 3
-grisou-39:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 4
-grisou-40:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 5
-grisou-41:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 6
-grisou-42:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 7
-grisou-43:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 6
-grisou-44:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 7
-grisou-45:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 15
-grisou-46:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 21
-grisou-47:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 21
-grisou-48:
-  pdu:
-    pdu_name: grimoire-pdu2
-    pdu_position: 22
-grisou-49:
-  pdu:
-    pdu_name: grimoire-pdu1
-    pdu_position: 22
-grisou-50:
-  pdu:
-    pdu_name: graoully-pdu2
-    pdu_position: 22
-grisou-51:
-  pdu:
-    pdu_name: graoully-pdu1
-    pdu_position: 22
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
deleted file mode 100644
index 70be7f93f9..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-1:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZY2J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1289
-      timewrite: 3014
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.1
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:60
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:62
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:64
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:65
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:64
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:66
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
deleted file mode 100644
index ff30b11bab..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-10:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39G0J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1254
-      timewrite: 2878
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.10
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:38
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:3c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:3d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:3a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:e8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:ea
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
deleted file mode 100644
index 11711cf7ff..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-11:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3970J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2977
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:bc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.11
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:b8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:bd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:ba
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:48
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:4a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
deleted file mode 100644
index a89fb20eaf..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-12:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39LZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1286
-      timewrite: 3209
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.12
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:c8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:cc
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:ca
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:cd
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:f0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:f2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
deleted file mode 100644
index c0ec063d44..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-13:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39D4J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1275
-      timewrite: 2923
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:94
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:95
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.13
-      driver: ixgbe
-      mac: 24:6e:96:03:11:90
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:92
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:f8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:fa
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
deleted file mode 100644
index 71e162a06d..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-14:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T72J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1293
-      timewrite: 2777
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.14
-      driver: ixgbe
-      mac: 24:6e:96:02:a3:e0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:e4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:e5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a3:e2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:b4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:b6
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
deleted file mode 100644
index b231d3884e..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-15:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3SZ1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1291
-      timewrite: 2913
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:9f:0c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.15
-      driver: ixgbe
-      mac: 24:6e:96:02:9f:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:9f:0d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:9f:0a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:78
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:7a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
deleted file mode 100644
index 59472fe129..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-16:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZSZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1305
-      timewrite: 2796
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:8c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.16
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:8d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:8a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:8c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:8e
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
deleted file mode 100644
index dd40a3ca00..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-17:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZR2J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2920
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:54
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.17
-      driver: ixgbe
-      mac: 24:6e:96:02:a1:50
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:55
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a1:52
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:c8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:ca
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
deleted file mode 100644
index 84fdc8226b..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-18:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZW3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1315
-      timewrite: 2938
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:94
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.18
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:90
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:95
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:92
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:40
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:42
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
deleted file mode 100644
index ab33d1a604..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-19:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39JZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1280
-      timewrite: 2896
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.19
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:a0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0f:a2
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:a4
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:f4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:a5
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:f6
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
deleted file mode 100644
index 7166bf5e9a..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-2:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3020J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1251
-      timewrite: 2915
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:9c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.2
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:9d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:9a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:54
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:56
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
deleted file mode 100644
index 85660fea67..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-20:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3933J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1306
-      timewrite: 2934
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:dc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.20
-      driver: ixgbe
-      mac: 24:6e:96:03:09:d8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:dd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:09:da
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:ec
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:ee
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
deleted file mode 100644
index d080987322..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-21:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39KZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1308
-      timewrite: 2885
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:14
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.21
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:10
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:15
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:12
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:fc
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:fe
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
deleted file mode 100644
index 36fe3a6947..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-22:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3984J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1305
-      timewrite: 2944
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.22
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:68
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:6a
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:6c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:6d
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:e8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:ea
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
deleted file mode 100644
index da80c9e6ad..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-23:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T83J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1290
-      timewrite: 2893
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:3c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.23
-      driver: ixgbe
-      mac: 24:6e:96:02:a1:38
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:3d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a1:3a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:a0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:a2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
deleted file mode 100644
index 698199ac9a..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-24:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T13J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1293
-      timewrite: 2874
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.24
-      driver: ixgbe
-      mac: 24:6e:96:02:a9:80
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a9:82
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:84
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:85
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:38
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:3a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
deleted file mode 100644
index 25d5c9f070..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-25:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3SX0J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1298
-      timewrite: 2914
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a7:d4
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.25
-      driver: ixgbe
-      mac: 24:6e:96:02:a7:d0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a7:d5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a7:d2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:f4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:f6
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
deleted file mode 100644
index 3fd9147605..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-26:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T24J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1308
-      timewrite: 2957
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:9c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.26
-      driver: ixgbe
-      mac: 24:6e:96:02:a1:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:9d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a1:9a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:34
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:36
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
deleted file mode 100644
index 2d38674d88..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-27:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3SY3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1296
-      timewrite: 2904
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:74
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.27
-      driver: ixgbe
-      mac: 24:6e:96:02:a4:70
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a4:72
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:75
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:c8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:ca
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
deleted file mode 100644
index 2d7075dc6c..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-28:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T44J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2907
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:c4
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.28
-      driver: ixgbe
-      mac: 24:6e:96:02:a3:c0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:c5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a3:c2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:c0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:c2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
deleted file mode 100644
index cc3cb37cad..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-29:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T33J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1306
-      timewrite: 2978
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:8c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.29
-      driver: ixgbe
-      mac: 24:6e:96:02:a9:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:8d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a9:8a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:90
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:92
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
deleted file mode 100644
index b174764c16..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-3:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZZ1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1273
-      timewrite: 2953
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:fc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.3
-      driver: ixgbe
-      mac: 24:6e:96:03:0b:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:fd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0b:fa
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:88
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:8a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
deleted file mode 100644
index f995486266..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-30:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3T04J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1308
-      timewrite: 2879
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.30
-      driver: ixgbe
-      mac: 24:6e:96:02:a4:30
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:34
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:35
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a4:32
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:44
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:46
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
deleted file mode 100644
index 20bc45a1be..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-31:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RL4J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1379
-      timewrite: 2928
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:fc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.31
-      driver: ixgbe
-      mac: 24:6e:96:03:10:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:10:fa
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:fd
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:dc
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:de
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
deleted file mode 100644
index 1294573f31..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-32:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RP3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1306
-      timewrite: 2931
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.32
-      driver: ixgbe
-      mac: 24:6e:96:03:11:d0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:d4
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:d2
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:d5
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:2c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:2e
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
deleted file mode 100644
index c292a67c8b..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-33:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RR1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1307
-      timewrite: 2944
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:b4
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.33
-      driver: ixgbe
-      mac: 24:6e:96:03:09:b0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:b5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:09:b2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:e4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:e6
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
deleted file mode 100644
index 842da1224d..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-34:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RM3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1278
-      timewrite: 2896
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.34
-      driver: ixgbe
-      mac: 24:6e:96:03:1f:c8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:cc
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:cd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:1f:ca
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:fc
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:fe
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
deleted file mode 100644
index b2ca230f57..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-35:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RN1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1331
-      timewrite: 2994
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:64
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.35
-      driver: ixgbe
-      mac: 24:6e:96:03:11:60
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:65
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:62
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:d0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:d2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
deleted file mode 100644
index 798cf5846a..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-36:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2M22J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1267
-      timewrite: 2897
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:74
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:75
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.36
-      driver: ixgbe
-      mac: 24:6e:96:03:11:70
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:72
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:c0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:c2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
deleted file mode 100644
index 5c5543280a..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-37:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2M53J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1304
-      timewrite: 2921
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.37
-      driver: ixgbe
-      mac: 24:6e:96:03:23:28
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:23:2a
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:23:2c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:23:2d
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:60
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:62
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
deleted file mode 100644
index 9cd41d6779..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-38:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2MD3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1300
-      timewrite: 2919
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.38
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:00
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:02
-      mounted: false
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:04
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:05
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:74
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:76
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
deleted file mode 100644
index b9c559439f..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-39:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2LZYH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2967
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.39
-      driver: ixgbe
-      mac: 24:6e:96:03:09:c0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:c4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:c5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:09:c2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:08
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:0a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
deleted file mode 100644
index fa52f71718..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-4:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZX2J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2940
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.4
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:40
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:44
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:45
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:42
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:bc
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:be
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
deleted file mode 100644
index 2c59914c65..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-40:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2M8ZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2955
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.40
-      driver: ixgbe
-      mac: 24:6e:96:03:21:58
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:21:5c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:21:5d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:21:5a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:fc
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:fe
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
deleted file mode 100644
index aefce8468b..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-41:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2LSZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1260
-      timewrite: 2930
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:fc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.41
-      driver: ixgbe
-      mac: 24:6e:96:03:11:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:fd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:fa
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:7c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:7e
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
deleted file mode 100644
index 3c1e3a6745..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-42:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2LY1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1272
-      timewrite: 2911
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.42
-      driver: ixgbe
-      mac: 24:6e:96:03:0b:b8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:bc
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:bd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0b:ba
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:4c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:4e
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
deleted file mode 100644
index b27817dc01..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-43:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2M3ZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1311
-      timewrite: 2956
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:e4
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.43
-      driver: ixgbe
-      mac: 24:6e:96:03:09:e0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:e5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:09:e2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:98
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:9a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
deleted file mode 100644
index 460b1f960f..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-44:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2M72J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1291
-      timewrite: 2911
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.44
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:10
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:14
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:15
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0c:12
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:d8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:da
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
deleted file mode 100644
index c5b421135f..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-45:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2MC0J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1264
-      timewrite: 2860
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:6c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.45
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:68
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:6d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:6a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:e4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4e:e6
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
deleted file mode 100644
index 00372dd0c3..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-46:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RQ2J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1284
-      timewrite: 2906
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.46
-      driver: ixgbe
-      mac: 24:6e:96:03:10:18
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:1c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:1d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:10:1a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:e0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:e2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
deleted file mode 100644
index 56edb0cf13..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-47:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RHZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2956
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:44
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.47
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:40
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:45
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:42
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:48
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:4a
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
deleted file mode 100644
index 1431c25e8c..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-48:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RK3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1295
-      timewrite: 2916
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:54
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.48
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:50
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:55
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0d:52
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:c8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:ca
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
deleted file mode 100644
index ccc0eba724..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-49:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2RG2J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2918
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:84
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.49
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:80
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:85
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0e:82
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:cc
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:ce
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
deleted file mode 100644
index e594c256b0..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-5:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZQ1J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1270
-      timewrite: 2945
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:ac
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.5
-      driver: ixgbe
-      mac: 24:6e:96:02:a0:a8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:ad
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a0:aa
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:50
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:52
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
deleted file mode 100644
index 5901746d80..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-grisou-50:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3F1ZH82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1278
-      timewrite: 2879
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:a4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:a5
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.50
-      driver: ixgbe
-      mac: 24:6e:96:03:0b:a0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0b:a2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:24
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:26
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.72.50
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71
-      rate: 56000000000
-      version: MT4099
-      mounted: true
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
deleted file mode 100644
index c2f49589a6..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-grisou-51:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2S11J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1281
-      timewrite: 2952
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:24
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.51
-      driver: ixgbe
-      mac: 24:6e:96:03:24:20
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:25
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:24:22
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:e8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4c:ea
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.72.51
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81
-      rate: 56000000000
-      version: MT4099
-      mounted: true
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
deleted file mode 100644
index 41e56956c1..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-6:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 2ZV3J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1290
-      timewrite: 3012
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:34
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.6
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:30
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:0a:32
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:35
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:b8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:ba
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
deleted file mode 100644
index 4962320e0c..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-7:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 3004J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1311
-      timewrite: 3013
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:5c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.7
-      driver: ixgbe
-      mac: 24:6e:96:03:10:58
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:5d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:10:5a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:ac
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4b:ae
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
deleted file mode 100644
index 28ee293d4f..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-8:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39N0J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2925
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:bc
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.8
-      driver: ixgbe
-      mac: 24:6e:96:03:11:b8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:bd
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:11:ba
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:d0
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4d:d2
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/generators/input/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
deleted file mode 100644
index 85d3606625..0000000000
--- a/generators/input/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-grisou-9:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.3
-    release_date: 06/03/2015
-  chassis:
-    serial_number: 39H4J82
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1261
-      timewrite: 3020
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_interfaces:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:97:ac
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.72.9
-      driver: ixgbe
-      mac: 24:6e:96:02:97:a8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:97:ad
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:97:aa
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:a8
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:aa
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-1.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-1.yaml
deleted file mode 100644
index d2b8fb52a7..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-1.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-1:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:a4
-      ip: 172.16.66.1
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:a5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-10.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-10.yaml
deleted file mode 100644
index dfb3b2b9a3..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-10.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-10:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:c2
-      ip: 172.16.66.10
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:c3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-100.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-100.yaml
deleted file mode 100644
index c82d5e19d2..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-100.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-100:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:92
-      ip: 172.16.66.100
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:93
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-101.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-101.yaml
deleted file mode 100644
index f0004acb61..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-101.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-101:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:90
-      ip: 172.16.66.101
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:91
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-102.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-102.yaml
deleted file mode 100644
index 895db24e43..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-102.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-102:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:92
-      ip: 172.16.66.102
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:93
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-103.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-103.yaml
deleted file mode 100644
index 1034483570..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-103.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-103:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:96
-      ip: 172.16.66.103
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:97
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-104.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-104.yaml
deleted file mode 100644
index 7ac3036a24..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-104.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-104:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:48
-      ip: 172.16.66.104
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:49
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-105.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-105.yaml
deleted file mode 100644
index a3106f2e69..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-105.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-105:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9b:a2
-      ip: 172.16.66.105
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9b:a3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-106.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-106.yaml
deleted file mode 100644
index 97ed89a670..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-106.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-106:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b8:b7:ee
-      ip: 172.16.66.106
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b8:b7:ef
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-107.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-107.yaml
deleted file mode 100644
index 23081e912c..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-107.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-107:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:76
-      ip: 172.16.66.107
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:77
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-108.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-108.yaml
deleted file mode 100644
index 9ee4014831..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-108.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-108:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:12
-      ip: 172.16.66.108
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:13
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-109.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-109.yaml
deleted file mode 100644
index e9d088f445..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-109.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-109:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:90
-      ip: 172.16.66.109
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:91
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-11.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-11.yaml
deleted file mode 100644
index 1449210e50..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-11.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-11:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:82
-      ip: 172.16.66.11
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:83
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-110.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-110.yaml
deleted file mode 100644
index 578d8f9d1f..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-110.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-110:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:96
-      ip: 172.16.66.110
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:97
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-111.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-111.yaml
deleted file mode 100644
index 4f47f11104..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-111.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-111:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:9c
-      ip: 172.16.66.111
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:9d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-112.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-112.yaml
deleted file mode 100644
index 601313b754..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-112.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-112:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:46
-      ip: 172.16.66.112
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:47
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-113.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-113.yaml
deleted file mode 100644
index 8150b88e14..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-113.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-113:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:5e
-      ip: 172.16.66.113
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:5f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-114.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-114.yaml
deleted file mode 100644
index 210918bce2..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-114.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-114:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:22
-      ip: 172.16.66.114
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:23
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-115.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-115.yaml
deleted file mode 100644
index 14cd48e1a0..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-115.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-115:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:28
-      ip: 172.16.66.115
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:29
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-116.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-116.yaml
deleted file mode 100644
index 37225b8b06..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-116.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-116:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:bc
-      ip: 172.16.66.116
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:bd
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-117.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-117.yaml
deleted file mode 100644
index ea1de41d91..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-117.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-117:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:54
-      ip: 172.16.66.117
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:55
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-118.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-118.yaml
deleted file mode 100644
index e76d1fad64..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-118.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-118:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:c4
-      ip: 172.16.66.118
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:c5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-119.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-119.yaml
deleted file mode 100644
index 9ae3fc11d1..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-119.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-119:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:8f:ca
-      ip: 172.16.66.119
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:8f:cb
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-12.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-12.yaml
deleted file mode 100644
index 68df9df477..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-12.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-12:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d6
-      ip: 172.16.66.57
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-120.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-120.yaml
deleted file mode 100644
index de5f945b9e..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-120.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-120:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:8c
-      ip: 172.16.66.120
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:8d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-121.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-121.yaml
deleted file mode 100644
index 0dd85c8198..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-121.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-121:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d6
-      ip: 172.16.66.57
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-122.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-122.yaml
deleted file mode 100644
index 284eb612c7..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-122.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-122:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c3:d4
-      ip: 172.16.66.122
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c3:d5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-123.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-123.yaml
deleted file mode 100644
index 0def6330e8..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-123.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-123:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:d6
-      ip: 172.16.66.123
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:d7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-124.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-124.yaml
deleted file mode 100644
index 236ad08766..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-124.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-124:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:6c
-      ip: 172.16.66.124
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:6d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-125.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-125.yaml
deleted file mode 100644
index b74f90b413..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-125.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-125:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:72
-      ip: 172.16.66.125
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:73
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-126.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-126.yaml
deleted file mode 100644
index cd2941a865..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-126.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-126:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:92
-      ip: 172.16.66.126
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:93
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-127.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-127.yaml
deleted file mode 100644
index 74d1969f08..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-127.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-127:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:6e
-      ip: 172.16.66.127
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:6f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-128.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-128.yaml
deleted file mode 100644
index 147c4a4643..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-128.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-128:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:6e
-      ip: 172.16.66.128
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:6f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-129.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-129.yaml
deleted file mode 100644
index 9eeaadaa09..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-129.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-129:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:74
-      ip: 172.16.66.129
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:75
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-13.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-13.yaml
deleted file mode 100644
index 0c23d59119..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-13.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-13:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:36
-      ip: 172.16.66.13
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:37
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-130.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-130.yaml
deleted file mode 100644
index c31b6f2c10..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-130.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-130:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:72
-      ip: 172.16.66.130
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:73
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-131.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-131.yaml
deleted file mode 100644
index b251efe4aa..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-131.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-131:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:6c
-      ip: 172.16.66.131
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:6d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-132.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-132.yaml
deleted file mode 100644
index b89977da06..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-132.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-132:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:26
-      ip: 172.16.66.132
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:27
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-133.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-133.yaml
deleted file mode 100644
index c029c313f9..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-133.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-133:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c6:0c
-      ip: 172.16.66.133
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c6:0d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-134.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-134.yaml
deleted file mode 100644
index 75a1f1d90d..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-134.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-134:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:aa
-      ip: 172.16.66.134
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:ab
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-14.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-14.yaml
deleted file mode 100644
index 922f55c5f4..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-14.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-14:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:d4
-      ip: 172.16.66.14
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:d5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-15.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-15.yaml
deleted file mode 100644
index 452eeea957..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-15.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-15:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b8:b7:de
-      ip: 172.16.66.15
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b8:b7:df
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 12884901888
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-16.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-16.yaml
deleted file mode 100644
index 49825deab4..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-16.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-16:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:8c
-      ip: 172.16.66.16
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:8d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 15032385536
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-17.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-17.yaml
deleted file mode 100644
index 2239c722e2..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-17.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-17:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:12
-      ip: 172.16.66.17
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:13
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-18.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-18.yaml
deleted file mode 100644
index 9ec7c0b1b0..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-18.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-18:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:d2
-      ip: 172.16.66.18
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:d3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-19.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-19.yaml
deleted file mode 100644
index cc14fe0fc5..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-19.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-19:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:38
-      ip: 172.16.66.19
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:39
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-2.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-2.yaml
deleted file mode 100644
index 9a9c4b232a..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-2.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-2:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:dc
-      ip: 172.16.66.2
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:dd
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-20.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-20.yaml
deleted file mode 100644
index 6beba27d51..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-20.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-20:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:90
-      ip: 172.16.66.20
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:91
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-21.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-21.yaml
deleted file mode 100644
index 2143fd5051..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-21.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-21:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:30
-      ip: 172.16.66.21
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:31
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-22.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-22.yaml
deleted file mode 100644
index e919a3349a..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-22.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-22:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:86
-      ip: 172.16.66.22
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:87
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-23.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-23.yaml
deleted file mode 100644
index ea1d3f593e..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-23.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-23:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:aa
-      ip: 172.16.66.23
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:ab
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-24.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-24.yaml
deleted file mode 100644
index d9b14efbd1..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-24.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-24:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:f6
-      ip: 172.16.66.24
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:f7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-25.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-25.yaml
deleted file mode 100644
index ff17dbf06b..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-25.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-25:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:b6
-      ip: 172.16.66.25
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:b7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-26.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-26.yaml
deleted file mode 100644
index f95956b429..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-26.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-26:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:9c
-      ip: 172.16.66.26
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:9d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-27.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-27.yaml
deleted file mode 100644
index caad2f8afd..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-27.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-27:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d2
-      ip: 172.16.66.27
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-28.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-28.yaml
deleted file mode 100644
index ec9b671fb3..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-28.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-28:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:ca
-      ip: 172.16.66.28
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:cb
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-29.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-29.yaml
deleted file mode 100644
index 67fa8dc6ba..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-29.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-29:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:a6
-      ip: 172.16.66.29
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:a7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 15032385536
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-3.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-3.yaml
deleted file mode 100644
index 311fc297da..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-3.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-3:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:b8
-      ip: 172.16.66.3
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:b9
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-30.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-30.yaml
deleted file mode 100644
index 62d49f1e32..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-30.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-30:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b7:8b:3a
-      ip: 172.16.66.30
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b7:8b:3b
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-31.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-31.yaml
deleted file mode 100644
index 00ac3519fc..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-31.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-31:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:3e
-      ip: 172.16.66.31
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:3f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-32.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-32.yaml
deleted file mode 100644
index ed0e11f7d4..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-32.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-32:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:50
-      ip: 172.16.66.32
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:51
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-33.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-33.yaml
deleted file mode 100644
index c26cdfdc90..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-33.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-33:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:10
-      ip: 172.16.66.33
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:11
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-34.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-34.yaml
deleted file mode 100644
index 5a8905dcb3..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-34.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-34:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:12
-      ip: 172.16.66.34
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:13
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-35.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-35.yaml
deleted file mode 100644
index e5bb1acb72..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-35.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-35:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:c6
-      ip: 172.16.66.35
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:c7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-36.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-36.yaml
deleted file mode 100644
index 22d9bdff71..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-36.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-36:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:1c
-      ip: 172.16.66.36
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:1d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-37.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-37.yaml
deleted file mode 100644
index c0dfa61b19..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-37.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-37:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:92
-      ip: 172.16.66.37
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:93
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-38.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-38.yaml
deleted file mode 100644
index 5aeabbeefd..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-38.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-38:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:46
-      ip: 172.16.66.38
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:47
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-39.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-39.yaml
deleted file mode 100644
index 281373a4c0..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-39.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-39:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:10
-      ip: 172.16.66.39
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:11
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-4.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-4.yaml
deleted file mode 100644
index a2d7c657b5..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-4.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-4:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:74
-      ip: 172.16.66.4
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:75
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-40.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-40.yaml
deleted file mode 100644
index fbcaa6295d..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-40.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-40:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72503
-      rev: V54O
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d8
-      ip: 172.16.66.40
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d9
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-41.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-41.yaml
deleted file mode 100644
index 82a6e3a245..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-41.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-41:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:22
-      ip: 172.16.66.41
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:23
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-42.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-42.yaml
deleted file mode 100644
index 2b778b29a4..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-42.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-42:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:2e
-      ip: 172.16.66.42
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:2f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-43.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-43.yaml
deleted file mode 100644
index 158e910f85..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-43.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-43:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:b0
-      ip: 172.16.66.43
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:b1
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-44.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-44.yaml
deleted file mode 100644
index 427029a606..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-44.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-44:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:74
-      ip: 172.16.66.44
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:75
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-45.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-45.yaml
deleted file mode 100644
index 92c01a2c3f..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-45.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-45:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:ca
-      ip: 172.16.66.45
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:cb
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-46.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-46.yaml
deleted file mode 100644
index 72b1a6a4f8..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-46.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-46:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:c6
-      ip: 172.16.66.46
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:c7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-47.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-47.yaml
deleted file mode 100644
index 339ae90baa..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-47.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-47:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:82
-      ip: 172.16.66.47
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:83
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-48.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-48.yaml
deleted file mode 100644
index 72464c9aea..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-48.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-48:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:62
-      ip: 172.16.66.48
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:63
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-49.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-49.yaml
deleted file mode 100644
index 1641efd85b..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-49.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-49:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:a4
-      ip: 172.16.66.49
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:a5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-5.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-5.yaml
deleted file mode 100644
index d1634a120e..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-5.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-5:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ee
-      ip: 172.16.66.5
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:ef
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-50.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-50.yaml
deleted file mode 100644
index d9d8debc4c..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-50.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-50:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:6c
-      ip: 172.16.66.50
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:6d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-51.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-51.yaml
deleted file mode 100644
index 2e4879936f..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-51.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-51:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:76
-      ip: 172.16.66.51
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:77
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-52.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-52.yaml
deleted file mode 100644
index 5257cc71a3..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-52.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-52:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:80
-      ip: 172.16.66.52
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:81
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-53.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-53.yaml
deleted file mode 100644
index 326ecb5289..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-53.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-53:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:f4
-      ip: 172.16.66.53
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:f5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-54.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-54.yaml
deleted file mode 100644
index 8c42a7d921..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-54.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-54:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:98
-      ip: 172.16.66.54
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:99
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-55.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-55.yaml
deleted file mode 100644
index 66c65585c5..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-55.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-55:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:8c
-      ip: 172.16.66.55
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:8d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-56.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-56.yaml
deleted file mode 100644
index d9cb051a02..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-56.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-56:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d0
-      ip: 172.16.66.56
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d1
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-57.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-57.yaml
deleted file mode 100644
index def9d937e3..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-57.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-57:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d6
-      ip: 172.16.66.57
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-58.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-58.yaml
deleted file mode 100644
index 8e39b7ce32..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-58.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-58:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:9c
-      ip: 172.16.66.58
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:9d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-59.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-59.yaml
deleted file mode 100644
index 95a4ea2897..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-59.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-59:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:32
-      ip: 172.16.66.59
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:33
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-6.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-6.yaml
deleted file mode 100644
index 74a7e51551..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-6.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-6:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:fe
-      ip: 172.16.66.6
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:ff
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-60.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-60.yaml
deleted file mode 100644
index c87619b853..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-60.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-60:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:9c
-      ip: 172.16.66.60
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:9d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-61.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-61.yaml
deleted file mode 100644
index 03a58765d4..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-61.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-61:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:94
-      ip: 172.16.66.61
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:95
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-62.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-62.yaml
deleted file mode 100644
index dde50c7954..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-62.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-62:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:9c
-      ip: 172.16.66.62
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:9d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-63.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-63.yaml
deleted file mode 100644
index c6cd8e34ca..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-63.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-63:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:1e
-      ip: 172.16.66.63
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:1f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-64.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-64.yaml
deleted file mode 100644
index 924d1891ed..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-64.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-64:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:da
-      ip: 172.16.66.64
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:db
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-65.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-65.yaml
deleted file mode 100644
index 729c921e5c..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-65.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-65:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:68
-      ip: 172.16.66.65
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:69
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-66.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-66.yaml
deleted file mode 100644
index 63ef5fa6fa..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-66.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-66:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:c2
-      ip: 172.16.66.66
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:c3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-67.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-67.yaml
deleted file mode 100644
index 24419cf637..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-67.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-67:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:b4
-      ip: 172.16.66.67
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:b5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-68.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-68.yaml
deleted file mode 100644
index cca6caf15e..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-68.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-68:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ac
-      ip: 172.16.66.68
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:ad
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-69.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-69.yaml
deleted file mode 100644
index 65063e48cb..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-69.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-69:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:dc
-      ip: 172.16.66.69
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:dd
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-7.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-7.yaml
deleted file mode 100644
index 6c2294084a..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-7.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-7:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d6
-      ip: 172.16.66.57
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-70.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-70.yaml
deleted file mode 100644
index 4d4b26c43a..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-70.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-70:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:2a
-      ip: 172.16.66.70
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:2b
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-71.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-71.yaml
deleted file mode 100644
index 517d3b4cd2..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-71.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-71:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:dc
-      ip: 172.16.66.71
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:dd
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-72.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-72.yaml
deleted file mode 100644
index 1e2928ba8f..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-72.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-72:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ce
-      ip: 172.16.66.72
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:cf
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-73.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-73.yaml
deleted file mode 100644
index 73dd7de7c1..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-73.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-73:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:72
-      ip: 172.16.66.73
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:73
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-74.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-74.yaml
deleted file mode 100644
index a493c762b5..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-74.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-74:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:84
-      ip: 172.16.66.74
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:85
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-75.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-75.yaml
deleted file mode 100644
index 752bb6450e..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-75.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-75:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:96
-      ip: 172.16.66.75
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:97
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-76.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-76.yaml
deleted file mode 100644
index 95be8d8d93..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-76.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-76:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:e8
-      ip: 172.16.66.76
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:e9
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-77.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-77.yaml
deleted file mode 100644
index c1c596bba9..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-77.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-77:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:8f:b6
-      ip: 172.16.66.77
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:8f:b7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-78.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-78.yaml
deleted file mode 100644
index 58b912b9c7..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-78.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-78:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:76
-      ip: 172.16.66.78
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:77
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-79.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-79.yaml
deleted file mode 100644
index 8e24371246..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-79.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-79:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:a2
-      ip: 172.16.66.79
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:a3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-8.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-8.yaml
deleted file mode 100644
index aebcd5dc72..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-8.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-8:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:d8
-      ip: 172.16.66.8
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:d9
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-80.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-80.yaml
deleted file mode 100644
index 5eecae4c7f..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-80.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-80:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:54
-      ip: 172.16.66.80
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:55
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-81.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-81.yaml
deleted file mode 100644
index 626d6a3ae2..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-81.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-81:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c3:7e
-      ip: 172.16.66.81
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c3:7f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-82.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-82.yaml
deleted file mode 100644
index 290385f666..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-82.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-82:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:0e
-      ip: 172.16.66.82
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:0f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-83.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-83.yaml
deleted file mode 100644
index 29196499a6..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-83.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-83:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d6
-      ip: 172.16.66.57
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-84.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-84.yaml
deleted file mode 100644
index 5d2b45126c..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-84.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-84:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:40
-      ip: 172.16.66.84
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:41
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-85.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-85.yaml
deleted file mode 100644
index 39dc29df5d..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-85.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-85:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:b2
-      ip: 172.16.66.85
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:b3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-86.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-86.yaml
deleted file mode 100644
index d292b632da..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-86.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-86:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:1a
-      ip: 172.16.66.86
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:1b
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-87.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-87.yaml
deleted file mode 100644
index 99864d6106..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-87.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-87:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ae
-      ip: 172.16.66.87
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:af
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-88.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-88.yaml
deleted file mode 100644
index 2a494dd4db..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-88.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-88:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:56
-      ip: 172.16.66.88
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:57
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-89.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-89.yaml
deleted file mode 100644
index a9c607fa7e..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-89.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-89:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:2c
-      ip: 172.16.66.89
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:2d
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-9.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-9.yaml
deleted file mode 100644
index 540c87fb3b..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-9.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-9:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:52
-      ip: 172.16.66.9
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:53
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-90.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-90.yaml
deleted file mode 100644
index 95581c9b59..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-90.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-90:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:e6
-      ip: 172.16.66.90
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:e7
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-91.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-91.yaml
deleted file mode 100644
index 0143d36172..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-91.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-91:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:f0
-      ip: 172.16.66.91
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:f1
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-92.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-92.yaml
deleted file mode 100644
index 6d4e32b255..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-92.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-92:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:d4
-      ip: 172.16.66.92
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:d5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-93.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-93.yaml
deleted file mode 100644
index fb871742c9..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-93.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-93:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:1e
-      ip: 172.16.66.93
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:1f
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-94.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-94.yaml
deleted file mode 100644
index 281836ca59..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-94.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-94:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9b:b4
-      ip: 172.16.66.94
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9b:b5
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 15032385536
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-95.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-95.yaml
deleted file mode 100644
index 4955a38cbd..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-95.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-95:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b8:b8:50
-      ip: 172.16.66.95
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b8:b8:51
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-96.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-96.yaml
deleted file mode 100644
index 639237b1e3..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-96.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-96:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:16
-      ip: 172.16.66.96
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:17
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-97.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-97.yaml
deleted file mode 100644
index beba533b33..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-97.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-97:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:a2
-      ip: 172.16.66.97
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:a3
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-98.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-98.yaml
deleted file mode 100644
index ad3b4a0a24..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-98.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-98:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:98
-      ip: 172.16.66.98
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:99
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/nodes/talc-99.yaml b/generators/input/sites/nancy/clusters/talc/nodes/talc-99.yaml
deleted file mode 100644
index b79cafd239..0000000000
--- a/generators/input/sites/nancy/clusters/talc/nodes/talc-99.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-talc-99:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  block_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
-  chassis:
-    product_name: S5393
-    manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:94
-      ip: 172.16.66.99
-      mountable: true
-      driver: e1000e
-      interface: Ethernet
-      management: false
-    eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:95
-      mountable: false
-      driver: e1000e
-      interface: Ethernet
-      management: false
-  main_memory:
-    ram_size: 17179869184
diff --git a/generators/input/sites/nancy/clusters/talc/talc.rb b/generators/input/sites/nancy/clusters/talc/talc.rb
deleted file mode 100644
index 320de2e0ea..0000000000
--- a/generators/input/sites/nancy/clusters/talc/talc.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-site :nancy do |site_uid|
-
-  cluster :talc do |cluster_uid|
-    model "Carri System CS-5393B"
-    created_at Time.parse("2009-04-10").httpdate
-    kavlan true
-    queues ['admin', 'production']
-
-    134.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 0.G,
-        :node_flops => 0.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :queues       => ['admin', 'production'],
-          :max_walltime => (31536000 if i >= 93) || (172800 if i >= 74) || (86400 if i >= 61) || (7200 if i >= 27) || (3600 if i >= 0)
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
-          :release  => "Jessie",
-          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
-          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
-        })
-        storage_devices [{
-          :interface  => 'SATA II',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :storage    => 'HDD',
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev')
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => "intel",
-          :version          => "80003ES2LAN",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch           => net_switch_lookup('nancy', 'talc', node_uid, 'eth0'),
-          :switch_port      => net_port_lookup('nancy', 'talc', node_uid, 'eth0'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "intel",
-          :version          => "BCM5721",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 100.M,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-          :vendor               => "Tyan",
-          :version              => "M3296"
-        }]
-
-        chassis({
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-  end # cluster talc
-end # nancy
diff --git a/generators/input/sites/nancy/nancy.rb b/generators/input/sites/nancy/nancy.rb
deleted file mode 100644
index 554870af13..0000000000
--- a/generators/input/sites/nancy/nancy.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :nancy do |site_uid|
-  name "Nancy"
-  location "Nancy, France"
-  web "http://www.loria.fr"
-  description "Grid5000 Nancy site"
-  latitude 48.7000
-  longitude 6.2000
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.16.0.0/14"
-  virt_ip_range "10.144.0.0/14"
-  storage5k true
-  production true
-
-  g5ksubnet({
-    :network => '10.144.0.0/14',
-    :gateway => '10.147.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.64.0/20',
-      :gateway => '172.16.79.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.79.120'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.79.121'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.79.122'
-    },
-    '4' => {
-      :network => '10.16.0.0/18',
-      :gateway => '10.16.63.254'
-    },
-    '5' => {
-      :network => '10.16.64.0/18',
-      :gateway => '10.16.127.254'
-    },
-    '6' => {
-      :network => '10.16.128.0/18',
-      :gateway => '10.16.191.254'
-    },
-    '7' => {
-      :network => '10.16.192.0/18',
-      :gateway => '10.16.255.254'
-    },
-    '8' => {
-      :network => '10.17.0.0/18',
-      :gateway => '10.17.63.254'
-    },
-    '9' => {
-      :network => '10.17.64.0/18',
-      :gateway => '10.17.127.254'
-    },
-    '14' => {
-      :network => '10.19.192.0/18',
-      :gateway => '10.19.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/nancy/net-links/gw-nancy.yaml b/generators/input/sites/nancy/net-links/gw-nancy.yaml
deleted file mode 100644
index 1431bf77d2..0000000000
--- a/generators/input/sites/nancy/net-links/gw-nancy.yaml
+++ /dev/null
@@ -1,933 +0,0 @@
----
-gw-nancy:
-  model: Cisco Nexus 9508
-  kind: router
-  site: nancy
-  snmp_community: public
-  mtu: 9220
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.79.254
-    "vlan101":
-      addresses:
-        - 172.17.79.254
-    "vlan500":
-      addresses:
-        - 192.168.4.14
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.16.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.16.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.16.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.16.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.17.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.17.64.0/18
-    "vlan714":
-      name: kavlan-14
-      addresses:
-        - 10.19.192.0/18
-  routes: {}
-  backplane_bps: 1280000000000
-  linecards:
-    1:
-      naming_pattern: "E%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      backplane_bps: 1280000000000
-      model: N9K-X9464PX
-      kind: other
-      rate: 10000000000
-      ports:
-        1:
-          uid: graoully-1
-          kind: node
-        2:
-          uid: graoully-2
-          kind: node
-        3:
-          uid: graoully-3
-          kind: node
-        4:
-          uid: graoully-4
-          kind: node
-        5:
-          uid: graoully-5
-          kind: node
-        6:
-          uid: graoully-6
-          kind: node
-        7:
-          uid: graoully-7
-          kind: node
-        8:
-          uid: graoully-8
-          kind: node
-        9:
-          uid: graoully-9
-          kind: node
-        10:
-          uid: graoully-10
-          kind: node
-        11:
-          uid: graoully-11
-          kind: node
-        12:
-          uid: graoully-12
-          kind: node
-        13:
-          uid: graoully-13
-          kind: node
-        14:
-          uid: graoully-14
-          kind: node
-        15:
-          uid: graoully-15
-          kind: node
-        16:
-          uid: graoully-16
-          kind: node
-        17:
-          uid: graphite-1
-          kind: node
-        18:
-          uid: graphite-2
-          kind: node
-        19:
-          uid: graphite-3
-          kind: node
-        20:
-          uid: graphite-4
-          kind: node
-        27:
-          uid: grisou-41
-          kind: node
-        28:
-          uid: grisou-42
-          kind: node
-        29:
-          uid: grisou-43
-          kind: node
-        30:
-          uid: grisou-44
-          kind: node
-        31:
-          uid: grisou-45
-          kind: node
-        32:
-          uid: grisou-46
-          kind: node
-        33:
-          uid: grisou-47
-          kind: node
-        34:
-          uid: grisou-48
-          kind: node
-        35:
-          uid: grisou-49
-          kind: node
-        36:
-          uid: grisou-50
-          kind: node
-        37:
-          uid: grisou-51
-          kind: node
-        39:
-          uid: grigri
-          kind: other
-        41:
-          uid: talc-data
-          kind: other
-        44:
-          uid: sbaie1-adm
-          kind: switch
-        45:
-          uid: sbaie2-adm
-          kind: switch
-        46:
-          uid: sgravillon1
-          kind: switch
-        48:
-          uid: renater-nancy
-          kind: virtual
-    2:
-      naming_pattern: "E%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      backplane_bps: 1280000000000
-      model: N9K-X9464PX
-      kind: node
-      rate: 10000000000
-      ports:
-        1:
-          uid: grisou-1
-          kind: node
-        2:
-          uid: grisou-2
-          kind: node
-        3:
-          uid: grisou-3
-          kind: node
-        4:
-          uid: grisou-4
-          kind: node
-        5:
-          uid: grisou-5
-          kind: node
-        6:
-          uid: grisou-6
-          kind: node
-        7:
-          uid: grisou-7
-          kind: node
-        8:
-          uid: grisou-8
-          kind: node
-        9:
-          uid: grisou-9
-          kind: node
-        10:
-          uid: grisou-10
-          kind: node
-        11:
-          uid: grisou-11
-          kind: node
-        12:
-          uid: grisou-12
-          kind: node
-        13:
-          uid: grisou-13
-          kind: node
-        14:
-          uid: grisou-14
-          kind: node
-        15:
-          uid: grisou-15
-          kind: node
-        16:
-          uid: grisou-16
-          kind: node
-        17:
-          uid: grisou-17
-          kind: node
-        18:
-          uid: grisou-18
-          kind: node
-        19:
-          uid: grisou-19
-          kind: node
-        20:
-          uid: grisou-20
-          kind: node
-        21:
-          uid: grisou-21
-          kind: node
-        22:
-          uid: grisou-22
-          kind: node
-        23:
-          uid: grisou-23
-          kind: node
-        24:
-          uid: grisou-24
-          kind: node
-        25:
-          uid: grisou-25
-          kind: node
-        26:
-          uid: grisou-26
-          kind: node
-        27:
-          uid: grisou-27
-          kind: node
-        28:
-          uid: grisou-28
-          kind: node
-        29:
-          uid: grisou-29
-          kind: node
-        30:
-          uid: grisou-30
-          kind: node
-        31:
-          uid: grisou-31
-          kind: node
-        32:
-          uid: grisou-32
-          kind: node
-        33:
-          uid: grisou-33
-          kind: node
-        34:
-          uid: grisou-34
-          kind: node
-        35:
-          uid: grisou-35
-          kind: node
-        36:
-          uid: grisou-36
-          kind: node
-        37:
-          uid: grisou-37
-          kind: node
-        38:
-          uid: grisou-38
-          kind: node
-        39:
-          uid: grisou-39
-          kind: node
-        40:
-          uid: grisou-40
-          kind: node
-        41:
-          uid: grimoire-1
-          kind: node
-        42:
-          uid: grimoire-2
-          kind: node
-        43:
-          uid: grimoire-3
-          kind: node
-        44:
-          uid: grimoire-4
-          kind: node
-        45:
-          uid: grimoire-5
-          kind: node
-        46:
-          uid: grimoire-6
-          kind: node
-        47:
-          uid: grimoire-7
-          kind: node
-        48:
-          uid: grimoire-8
-          kind: node
-    3:
-      naming_pattern: "E%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      backplane_bps: 1280000000000
-      model: N9K-X9464PX
-      kind: node
-      rate: 10000000000
-      ports:
-        1:
-          uid: grisou-1
-          kind: node
-          port: eth1
-        2:
-          uid: grisou-2
-          kind: node
-          port: eth1
-        3:
-          uid: grisou-3
-          kind: node
-          port: eth1
-        4:
-          uid: grisou-4
-          kind: node
-          port: eth1
-        5:
-          uid: grisou-5
-          kind: node
-          port: eth1
-        6:
-          uid: grisou-6
-          kind: node
-          port: eth1
-        7:
-          uid: grisou-7
-          kind: node
-          port: eth1
-        8:
-          uid: grisou-8
-          kind: node
-          port: eth1
-        9:
-          uid: grisou-9
-          kind: node
-          port: eth1
-        10:
-          uid: grisou-10
-          kind: node
-          port: eth1
-        11:
-          uid: grisou-11
-          kind: node
-          port: eth1
-        12:
-          uid: grisou-12
-          kind: node
-          port: eth1
-        13:
-          uid: grisou-13
-          kind: node
-          port: eth1
-        14:
-          uid: grisou-14
-          kind: node
-          port: eth1
-        15:
-          uid: grisou-15
-          kind: node
-          port: eth1
-        16:
-          uid: grisou-16
-          kind: node
-          port: eth1
-        17:
-          uid: grisou-17
-          kind: node
-          port: eth1
-        18:
-          uid: grisou-18
-          kind: node
-          port: eth1
-        19:
-          uid: grisou-19
-          kind: node
-          port: eth1
-        20:
-          uid: grisou-20
-          kind: node
-          port: eth1
-        21:
-          uid: grisou-21
-          kind: node
-          port: eth1
-        22:
-          uid: grisou-22
-          kind: node
-          port: eth1
-        23:
-          uid: grisou-23
-          kind: node
-          port: eth1
-        24:
-          uid: grisou-24
-          kind: node
-          port: eth1
-        25:
-          uid: grisou-25
-          kind: node
-          port: eth1
-        26:
-          uid: grisou-26
-          kind: node
-          port: eth1
-        27:
-          uid: grisou-27
-          kind: node
-          port: eth1
-        28:
-          uid: grisou-28
-          kind: node
-          port: eth1
-        29:
-          uid: grisou-29
-          kind: node
-          port: eth1
-        30:
-          uid: grisou-30
-          kind: node
-          port: eth1
-        31:
-          uid: grisou-31
-          kind: node
-          port: eth1
-        32:
-          uid: grisou-32
-          kind: node
-          port: eth1
-        33:
-          uid: grisou-33
-          kind: node
-          port: eth1
-        34:
-          uid: grisou-34
-          kind: node
-          port: eth1
-        35:
-          uid: grisou-35
-          kind: node
-          port: eth1
-        36:
-          uid: grisou-36
-          kind: node
-          port: eth1
-        37:
-          uid: grisou-37
-          kind: node
-          port: eth1
-        38:
-          uid: grisou-38
-          kind: node
-          port: eth1
-        39:
-          uid: grisou-39
-          kind: node
-          port: eth1
-        40:
-          uid: grisou-40
-          kind: node
-          port: eth1
-        41:
-          uid: grimoire-1
-          kind: node
-          port: eth1
-        42:
-          uid: grimoire-2
-          kind: node
-          port: eth1
-        43:
-          uid: grimoire-3
-          kind: node
-          port: eth1
-        44:
-          uid: grimoire-4
-          kind: node
-          port: eth1
-        45:
-          uid: grimoire-5
-          kind: node
-          port: eth1
-        46:
-          uid: grimoire-6
-          kind: node
-          port: eth1
-        47:
-          uid: grimoire-7
-          kind: node
-          port: eth1
-        48:
-          uid: grimoire-8
-          kind: node
-          port: eth1
-    4:
-      naming_pattern: "E%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      backplane_bps: 1280000000000
-      model: N9K-X9464PX
-      kind: node
-      rate: 10000000000
-      ports:
-        1:
-          uid: grisou-1
-          kind: node
-          port: eth2
-        2:
-          uid: grisou-2
-          kind: node
-          port: eth2
-        3:
-          uid: grisou-3
-          kind: node
-          port: eth2
-        4:
-          uid: grisou-4
-          kind: node
-          port: eth2
-        5:
-          uid: grisou-5
-          kind: node
-          port: eth2
-        6:
-          uid: grisou-6
-          kind: node
-          port: eth2
-        7:
-          uid: grisou-7
-          kind: node
-          port: eth2
-        8:
-          uid: grisou-8
-          kind: node
-          port: eth2
-        9:
-          uid: grisou-9
-          kind: node
-          port: eth2
-        10:
-          uid: grisou-10
-          kind: node
-          port: eth2
-        11:
-          uid: grisou-11
-          kind: node
-          port: eth2
-        12:
-          uid: grisou-12
-          kind: node
-          port: eth2
-        13:
-          uid: grisou-13
-          kind: node
-          port: eth2
-        14:
-          uid: grisou-14
-          kind: node
-          port: eth2
-        15:
-          uid: grisou-15
-          kind: node
-          port: eth2
-        16:
-          uid: grisou-16
-          kind: node
-          port: eth2
-        17:
-          uid: grisou-17
-          kind: node
-          port: eth2
-        18:
-          uid: grisou-18
-          kind: node
-          port: eth2
-        19:
-          uid: grisou-19
-          kind: node
-          port: eth2
-        20:
-          uid: grisou-20
-          kind: node
-          port: eth2
-        21:
-          uid: grisou-21
-          kind: node
-          port: eth2
-        22:
-          uid: grisou-22
-          kind: node
-          port: eth2
-        23:
-          uid: grisou-23
-          kind: node
-          port: eth2
-        24:
-          uid: grisou-24
-          kind: node
-          port: eth2
-        25:
-          uid: grisou-25
-          kind: node
-          port: eth2
-        26:
-          uid: grisou-26
-          kind: node
-          port: eth2
-        27:
-          uid: grisou-27
-          kind: node
-          port: eth2
-        28:
-          uid: grisou-28
-          kind: node
-          port: eth2
-        29:
-          uid: grisou-29
-          kind: node
-          port: eth2
-        30:
-          uid: grisou-30
-          kind: node
-          port: eth2
-        31:
-          uid: grisou-31
-          kind: node
-          port: eth2
-        32:
-          uid: grisou-32
-          kind: node
-          port: eth2
-        33:
-          uid: grisou-33
-          kind: node
-          port: eth2
-        34:
-          uid: grisou-34
-          kind: node
-          port: eth2
-        35:
-          uid: grisou-35
-          kind: node
-          port: eth2
-        36:
-          uid: grisou-36
-          kind: node
-          port: eth2
-        37:
-          uid: grisou-37
-          kind: node
-          port: eth2
-        38:
-          uid: grisou-38
-          kind: node
-          port: eth2
-        39:
-          uid: grisou-39
-          kind: node
-          port: eth2
-        40:
-          uid: grisou-40
-          kind: node
-          port: eth2
-        41:
-          uid: grimoire-1
-          kind: node
-          port: eth2
-        42:
-          uid: grimoire-2
-          kind: node
-          port: eth2
-        43:
-          uid: grimoire-3
-          kind: node
-          port: eth2
-        44:
-          uid: grimoire-4
-          kind: node
-          port: eth2
-        45:
-          uid: grimoire-5
-          kind: node
-          port: eth2
-        46:
-          uid: grimoire-6
-          kind: node
-          port: eth2
-        47:
-          uid: grimoire-7
-          kind: node
-          port: eth2
-        48:
-          uid: grimoire-8
-          kind: node
-          port: eth2
-    5:
-      naming_pattern: "E%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      backplane_bps: 1280000000000
-      model: N9K-X9464PX
-      kind: node
-      rate: 10000000000
-      ports:
-        1:
-          uid: grisou-1
-          kind: node
-          port: eth3
-        2:
-          uid: grisou-2
-          kind: node
-          port: eth3
-        3:
-          uid: grisou-3
-          kind: node
-          port: eth3
-        4:
-          uid: grisou-4
-          kind: node
-          port: eth3
-        5:
-          uid: grisou-5
-          kind: node
-          port: eth3
-        6:
-          uid: grisou-6
-          kind: node
-          port: eth3
-        7:
-          uid: grisou-7
-          kind: node
-          port: eth3
-        8:
-          uid: grisou-8
-          kind: node
-          port: eth3
-        9:
-          uid: grisou-9
-          kind: node
-          port: eth3
-        10:
-          uid: grisou-10
-          kind: node
-          port: eth3
-        11:
-          uid: grisou-11
-          kind: node
-          port: eth3
-        12:
-          uid: grisou-12
-          kind: node
-          port: eth3
-        13:
-          uid: grisou-13
-          kind: node
-          port: eth3
-        14:
-          uid: grisou-14
-          kind: node
-          port: eth3
-        15:
-          uid: grisou-15
-          kind: node
-          port: eth3
-        16:
-          uid: grisou-16
-          kind: node
-          port: eth3
-        17:
-          uid: grisou-17
-          kind: node
-          port: eth3
-        18:
-          uid: grisou-18
-          kind: node
-          port: eth3
-        19:
-          uid: grisou-19
-          kind: node
-          port: eth3
-        20:
-          uid: grisou-20
-          kind: node
-          port: eth3
-        21:
-          uid: grisou-21
-          kind: node
-          port: eth3
-        22:
-          uid: grisou-22
-          kind: node
-          port: eth3
-        23:
-          uid: grisou-23
-          kind: node
-          port: eth3
-        24:
-          uid: grisou-24
-          kind: node
-          port: eth3
-        25:
-          uid: grisou-25
-          kind: node
-          port: eth3
-        26:
-          uid: grisou-26
-          kind: node
-          port: eth3
-        27:
-          uid: grisou-27
-          kind: node
-          port: eth3
-        28:
-          uid: grisou-28
-          kind: node
-          port: eth3
-        29:
-          uid: grisou-29
-          kind: node
-          port: eth3
-        30:
-          uid: grisou-30
-          kind: node
-          port: eth3
-        31:
-          uid: grisou-31
-          kind: node
-          port: eth3
-        32:
-          uid: grisou-32
-          kind: node
-          port: eth3
-        33:
-          uid: grisou-33
-          kind: node
-          port: eth3
-        34:
-          uid: grisou-34
-          kind: node
-          port: eth3
-        35:
-          uid: grisou-35
-          kind: node
-          port: eth3
-        36:
-          uid: grisou-36
-          kind: node
-          port: eth3
-        37:
-          uid: grisou-37
-          kind: node
-          port: eth3
-        38:
-          uid: grisou-38
-          kind: node
-          port: eth3
-        39:
-          uid: grisou-39
-          kind: node
-          port: eth3
-        40:
-          uid: grisou-40
-          kind: node
-          port: eth3
-        41:
-          uid: grimoire-1
-          kind: node
-          port: eth3
-        42:
-          uid: grimoire-2
-          kind: node
-          port: eth3
-        43:
-          uid: grimoire-3
-          kind: node
-          port: eth3
-        44:
-          uid: grimoire-4
-          kind: node
-          port: eth3
-        45:
-          uid: grimoire-5
-          kind: node
-          port: eth3
-        46:
-          uid: grimoire-6
-          kind: node
-          port: eth3
-        47:
-          uid: grimoire-7
-          kind: node
-          port: eth3
-        48:
-          uid: grimoire-8
-          kind: node
-          port: eth3
diff --git a/generators/input/sites/nancy/net-links/sgraoullyib.yaml b/generators/input/sites/nancy/net-links/sgraoullyib.yaml
deleted file mode 100644
index fdc118bfbf..0000000000
--- a/generators/input/sites/nancy/net-links/sgraoullyib.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-sgraoullyib:
-  model: Infiniband
-  kind: switch
-  site: nancy
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards:
-    12:
-      naming_pattern: "%LINECARD%/%PORT%"
-      snmp_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 20000000000
-      ports:
-        12: 
-          uid: sgriffonib
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene1.yaml b/generators/input/sites/nancy/net-links/sgraphene1.yaml
deleted file mode 100644
index cc617db0eb..0000000000
--- a/generators/input/sites/nancy/net-links/sgraphene1.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-sgraphene1:
-  model: 3com 4510G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.201
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        2: graphene-1
-        1: graphene-2
-        4: graphene-3
-        3: graphene-4
-        6: graphene-5
-        5: graphene-6
-        8: graphene-7
-        12: graphene-8
-        11: graphene-9
-        7: graphene-10
-        10: graphene-11
-        9: graphene-12
-        14: graphene-13
-        13: graphene-14
-        16: graphene-15
-        15: graphene-16
-        18: graphene-17
-        17: graphene-18
-        20: graphene-19
-        19: graphene-20
-        22: graphene-21
-        21: graphene-22
-        24: graphene-23
-        23: graphene-24
-        26: graphene-25
-        25: graphene-26
-        28: graphene-27
-        27: graphene-28
-        30: graphene-29
-        29: graphene-30
-        32: graphene-31
-        31: graphene-32
-        34: graphene-33
-        33: graphene-34
-        36: graphene-35
-        35: graphene-36
-        38: graphene-37
-        37: graphene-38
-        40: graphene-39
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        2: 
-          uid: sgravillon1
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene2.yaml b/generators/input/sites/nancy/net-links/sgraphene2.yaml
deleted file mode 100644
index 63ce18d6c8..0000000000
--- a/generators/input/sites/nancy/net-links/sgraphene2.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-sgraphene2:
-  model: 3com 4510G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.202
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        2: graphene-41
-        1: graphene-40
-        3: graphene-42
-        4: graphene-43
-        5: graphene-44
-        6: graphene-45
-        7: graphene-46
-        8: graphene-47
-        9: graphene-48
-        10: graphene-49
-        11: graphene-50
-        12: graphene-51
-        13: graphene-52
-        14: graphene-53
-        15: graphene-54
-        16: graphene-55
-        17: graphene-56
-        18: graphene-57
-        19: graphene-58
-        20: graphene-59
-        21: graphene-60
-        22: graphene-61
-        23: graphene-62
-        24: graphene-63
-        25: graphene-64
-        26: graphene-65
-        27: graphene-66
-        28: graphene-67
-        29: graphene-68
-        30: graphene-69
-        31: graphene-70
-        32: graphene-71
-        33: graphene-72
-        34: graphene-73
-        35: graphene-74
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        2: 
-          uid: sgravillon1
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene3.yaml b/generators/input/sites/nancy/net-links/sgraphene3.yaml
deleted file mode 100644
index 7f09f103f0..0000000000
--- a/generators/input/sites/nancy/net-links/sgraphene3.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sgraphene3:
-  model: 3com 4510G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.203
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        2: graphene-75
-        1: graphene-76
-        4: graphene-77
-        3: graphene-78
-        6: graphene-79
-        5: graphene-80
-        8: graphene-81
-        7: graphene-82
-        10: graphene-83
-        9: graphene-84
-        12: graphene-85
-        11: graphene-86
-        14: graphene-87
-        13: graphene-88
-        16: graphene-89
-        15: graphene-90
-        18: graphene-91
-        17: graphene-92
-        20: graphene-93
-        19: graphene-94
-        22: graphene-95
-        21: graphene-96
-        24: graphene-97
-        23: graphene-98
-        26: graphene-99
-        25: graphene-100
-        28: graphene-101
-        27: graphene-102
-        30: graphene-103
-        29: graphene-104
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        2: 
-          uid: sgravillon1
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgraphene4.yaml b/generators/input/sites/nancy/net-links/sgraphene4.yaml
deleted file mode 100644
index f81db33d88..0000000000
--- a/generators/input/sites/nancy/net-links/sgraphene4.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-sgraphene4:
-  model: 3com 4510G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.204
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        2: graphene-106
-        1: graphene-105
-        3: graphene-107
-        4: graphene-108
-        5: graphene-109
-        6: graphene-110
-        7: graphene-111
-        8: graphene-112
-        9: graphene-113
-        10: graphene-114
-        11: graphene-115
-        12: graphene-116
-        13: graphene-117
-        14: graphene-118
-        15: graphene-119
-        16: graphene-120
-        17: graphene-121
-        18: graphene-122
-        19: graphene-123
-        20: graphene-124
-        21: graphene-125
-        22: graphene-126
-        23: graphene-127
-        24: graphene-128
-        25: graphene-129
-        26: graphene-130
-        27: graphene-131
-        28: graphene-132
-        29: graphene-133
-        30: graphene-134
-        31: graphene-135
-        32: graphene-136
-        33: graphene-137
-        34: graphene-138
-        35: graphene-139
-        36: graphene-140
-        37: graphene-141
-        38: graphene-142
-        39: graphene-143
-        40: graphene-144
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: 
-          uid: sgravillon1
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgrapheneib.yaml b/generators/input/sites/nancy/net-links/sgrapheneib.yaml
deleted file mode 100644
index a8b4e9e232..0000000000
--- a/generators/input/sites/nancy/net-links/sgrapheneib.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-sgrapheneib:
-  model: Infiniband
-  kind: switch
-  site: nancy
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  vlans:
-    naming_pattern: Vlan%VLANID%
-  routes: {}
-
-  linecards:
-    12:
-      naming_pattern: "%LINECARD%/%PORT%"
-      snmp_pattern: "%LINECARD%/%PORT%"
-      kind: switch
-      rate: 20000000000
-      ports:
-        12: 
-          uid: sgriffonib
-          kind: switch
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/sgravillon1.yaml b/generators/input/sites/nancy/net-links/sgravillon1.yaml
deleted file mode 100644
index 7a1e4c29b0..0000000000
--- a/generators/input/sites/nancy/net-links/sgravillon1.yaml
+++ /dev/null
@@ -1,196 +0,0 @@
----
-sgravillon1:
-  model: HP Procurve 5406zl J8697A
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9220
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.79.254
-    "vlan101":
-      addresses:
-        - 172.17.79.254
-    "vlan500":
-      addresses:
-        - 192.168.4.14
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.16.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.16.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.16.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.16.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.17.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.17.64.0/18
-    "vlan714":
-      name: kavlan-14
-      addresses:
-        - 10.19.192.0/18
-  routes: {}
-  backplane_bps: 346000000000
-  linecards:
-    1:
-      naming_pattern: "%LINECARD:A%%PORT%"
-      snmp_pattern: "A%PORT%"
-      backplane_bps: 14400000000
-      model: J8702A
-      kind: other
-      rate: 1000000000
-      ports:
-        1:
-          kind: other
-          uid: sgrapheneib
-        2:
-          port: bmc
-          uid: fgriffon2
-          kind: other
-        3:
-          uid: stalc1-ipmi
-          kind: other
-        4:
-          uid: stalc1
-          kind: switch
-        8:
-          port: eth0
-          uid: grog
-          kind: other
-        9:
-          port: eth1
-          uid: grog
-          kind: other
-        10:
-          port: bmc
-          kind: other
-          uid: fgriffon1
-        11:
-          port: eth0
-          uid: fgriffon1
-          kind: other
-        13:
-          uid: sgraphene1-ipmi
-          kind: other
-        14:
-          uid: sgraphene2-ipmi
-          kind: other
-        15:
-          uid: sgraphene3-ipmi
-          kind: other
-        16:
-          uid: sgraphene4-ipmi
-          kind: other
-        18:
-          uid: LORIA
-          kind: virtual
-        20:
-          uid: sgriffon1-ipmi
-          kind: other
-        23:
-          port: eth1
-          uid: fgriffon1
-          kind: other
-    2:
-      naming_pattern: "%LINECARD:B%%PORT%"
-      snmp_pattern: "B%PORT%"
-      backplane_bps: 14400000000
-      model: J8708A
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: sgriffon1
-    3:
-      naming_pattern: "%LINECARD:C%%PORT%"
-      snmp_pattern: "C%PORT%"
-      backplane_bps: 14400000000
-      model: J8708A
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: sgraphene1
-        2: sgraphene2
-        4: sgraphene4
-    4:
-      naming_pattern: "%LINECARD:D%%PORT%"
-      snmp_pattern: "D%PORT%"
-      backplane_bps: 14400000000
-      model: J8708A
-      kind: other
-      rate: 10000000000
-      ports:
-        1:
-          kind: other
-          uid: fgriffon1
-          port: eth2
-        2:
-          kind: other
-          uid: fgriffon2
-          port: eth2
-        4:
-          uid: sgraphene3
-          kind: switch
-    6:
-      naming_pattern: "%LINECARD:F%%PORT%"
-      snmp_pattern: "F%PORT%"
-      backplane_bps: 14400000000
-      model: J9538A
-      kind: other
-      rate: 10000000000
-      ports:
-        1:
-          uid: gw-nancy
-          kind: router
-        5:
-          uid: srv
-          kind: virtual
-        6:
-          uid: srv
-          kind: virtual
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Trk%CHANNELID%
-    "lacp1":
-        - linecard: 1
-          port: 22
-          port: 24
-    "lacp2":
-        - linecard: 1
-          port: 8
-          port: 9
-    "lacp3":
-        - linecard: 1
-          port: 11
-          port: 23
-    "lacp4":
-        - linecard: 1
-          port: 12
-          port: 17
diff --git a/generators/input/sites/nancy/net-links/sgriffon1.yaml b/generators/input/sites/nancy/net-links/sgriffon1.yaml
deleted file mode 100644
index f5a1fb4ff1..0000000000
--- a/generators/input/sites/nancy/net-links/sgriffon1.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-sgriffon1:
-  model: 3com 4500g
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.205
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        2: griffon-2
-        1: griffon-1
-        3: griffon-3
-        4: griffon-4
-        5: griffon-5
-        6: griffon-6
-        7: griffon-7
-        8: griffon-8
-        10: griffon-9
-        9: griffon-10
-        25: griffon-11
-        26: griffon-12
-        27: griffon-13
-        28: griffon-14
-        29: griffon-15
-        30: griffon-16
-        31: griffon-17
-        32: griffon-18
-        33: griffon-19
-        34: griffon-20
-        35: griffon-21
-        36: griffon-22
-        37: griffon-23
-        38: griffon-24
-        39: griffon-25
-        40: griffon-26
-        41: griffon-27
-        42: griffon-28
-        43: griffon-29
-        11: griffon-58
-        12: griffon-59
-        13: griffon-60
-        20:
-          uid: griffon-11
-          port: eth1
-        44:
-          uid: griffon-12
-          port: eth1
-        21:
-          uid: griffon-13
-          port: eth1
-        45:
-          uid: griffon-14
-          port: eth1
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: other
-      rate: 10000000000
-      ports:
-        2: 
-          uid: sgravillon1
-          kind: switch
-
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc1.yaml b/generators/input/sites/nancy/net-links/stalc1.yaml
deleted file mode 100644
index a7053597b5..0000000000
--- a/generators/input/sites/nancy/net-links/stalc1.yaml
+++ /dev/null
@@ -1,178 +0,0 @@
----
-stalc1:
-  model: 3com 4500G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.224
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        1:
-          uid: talc-1
-          port: eth0
-        3:
-          uid: talc-2
-          port: eth0
-        5:
-          uid: talc-134
-          port: eth0
-        6:
-          uid: talc-3
-          port: eth0
-        7:
-          uid: talc-4
-          port: eth0
-        8:
-          uid: talc-5
-          port: eth0
-        9:
-          uid: talc-6
-          port: eth0
-        10:
-          uid: talc-7
-          port: eth0
-        11:
-          uid: talc-8
-          port: eth0
-        12:
-          uid: talc-9
-          port: eth0
-        13:
-          uid: talc-10
-          port: eth0
-        14:
-          uid: talc-11
-          port: eth0
-        15:
-          uid: talc-12
-          port: eth0
-        16:
-          uid: talc-13
-          port: eth0
-        17:
-          uid: talc-14
-          port: eth0
-        18:
-          uid: talc-15
-          port: eth0
-        19:
-          uid: talc-16
-          port: eth0
-        20:
-          uid: talc-17
-          port: eth0
-        21:
-          uid: talc-18
-          port: eth0
-        22:
-          uid: graphique-2
-          port: eth2
-        23:
-          uid: graphique-6
-          port: eth2
-        25:
-          uid: talc-19
-          port: eth0
-        26:
-          uid: talc-20
-          port: eth0
-        27:
-          uid: talc-21
-          port: eth0
-        28:
-          uid: talc-22
-          port: eth0
-        29:
-          uid: talc-23
-          port: eth0
-        30:
-          uid: talc-24
-          port: eth0
-        31:
-          uid: talc-25
-          port: eth0
-        32:
-          uid: talc-26
-          port: eth0
-        33:
-          uid: talc-27
-          port: eth0
-        34:
-          uid: talc-28
-          port: eth0
-        35:
-          uid: talc-29
-          port: eth0
-        36:
-          uid: talc-30
-          port: eth0
-        37:
-          uid: talc-31
-          port: eth0
-        38:
-          uid: talc-32
-          port: eth0
-        39:
-          uid: talc-33
-          port: eth0
-        40:
-          uid: talc-34
-          port: eth0
-        41:
-          uid: talc-35
-          port: eth0
-        42:
-          uid: talc-36
-          port: eth0
-        43:
-          uid: talc-37
-          port: eth0
-        44:
-          uid: graphique-3
-          port: eth2
-        45:
-          uid: graphique-4
-          port: eth2
-        46:
-          uid: graphique-5
-          port: eth2
-        47:
-          uid: graphique-1
-          port: eth2
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        2: stalc3
-    2:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: other
-      rate: 10000000000
-      ports:
-        1: 
-          uid: sgravillon1
-          kind: switch
-        2:
-          kind: other
-          rate: 10000000000
-          uid: talc-srv
-          port: eth2
-  channels:
-    naming_pattern: Po%CHANNELID%
-
diff --git a/generators/input/sites/nancy/net-links/stalc2.yaml b/generators/input/sites/nancy/net-links/stalc2.yaml
deleted file mode 100644
index 3f4987a68b..0000000000
--- a/generators/input/sites/nancy/net-links/stalc2.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
----
-stalc2:
-  model: 3com 4500G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.225
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        3:
-          uid: talc-38
-          port: eth0
-        4:
-          uid: talc-39
-          port: eth0
-        5:
-          uid: talc-40
-          port: eth0
-        6:
-          uid: talc-41
-          port: eth0
-        7:
-          uid: talc-42
-          port: eth0
-        8:
-          uid: talc-43
-          port: eth0
-        9:
-          uid: talc-44
-          port: eth0
-        10:
-          uid: talc-45
-          port: eth0
-        11:
-          uid: talc-46
-          port: eth0
-        12:
-          uid: talc-47
-          port: eth0
-        13:
-          uid: talc-48
-          port: eth0
-        14:
-          uid: talc-49
-          port: eth0
-        25:
-          uid: talc-50
-          port: eth0
-        26:
-          uid: talc-51
-          port: eth0
-        27:
-          uid: talc-52
-          port: eth0
-        28:
-          uid: talc-53
-          port: eth0
-        29:
-          uid: talc-54
-          port: eth0
-        30:
-          uid: talc-55
-          port: eth0
-        31:
-          uid: talc-56
-          port: eth0
-        32:
-          uid: talc-57
-          port: eth0
-        33:
-          uid: talc-58
-          port: eth0
-        34:
-          uid: talc-59
-          port: eth0
-        35:
-          uid: talc-60
-          port: eth0
-        36:
-          uid: talc-61
-          port: eth0
-        37:
-          uid: talc-62
-          port: eth0
-        38:
-          uid: talc-63
-          port: eth0
-        39:
-          uid: talc-64
-          port: eth0
-        40:
-          uid: talc-65
-          port: eth0
-        41:
-          uid: talc-66
-          port: eth0
-        42:
-          uid: talc-67
-          port: eth0
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: stalc4
-        2: stalc3
-    2:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: other
-      rate: 10000000000
-      ports:
-        1:
-          port: eth2
-          uid: ftalc1
-          kind: other
-        2:
-          port: eth2
-          uid: ftalc2
-          kind: other
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc3.yaml b/generators/input/sites/nancy/net-links/stalc3.yaml
deleted file mode 100644
index 0756687526..0000000000
--- a/generators/input/sites/nancy/net-links/stalc3.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
----
-stalc3:
-  model: 3com 4500G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan-interface%VLANID%
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.16.79.226
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        2:
-          uid: talc-69
-          port: eth0
-        1:
-          uid: talc-68
-          port: eth0
-        3:
-          uid: talc-70
-          port: eth0
-        4:
-          uid: talc-71
-          port: eth0
-        5:
-          uid: talc-72
-          port: eth0
-        6:
-          uid: talc-73
-          port: eth0
-        7:
-          uid: talc-74
-          port: eth0
-        8:
-          uid: talc-75
-          port: eth0
-        9:
-          uid: talc-76
-          port: eth0
-        10:
-          uid: talc-77
-          port: eth0
-        11:
-          uid: talc-78
-          port: eth0
-        12:
-          uid: talc-79
-          port: eth0
-        13:
-          uid: talc-80
-          port: eth0
-        14:
-          uid: talc-81
-          port: eth0
-        15:
-          uid: talc-82
-          port: eth0
-        16:
-          uid: talc-83
-          port: eth0
-        17:
-          uid: talc-84
-          port: eth0
-        18:
-          uid: talc-85
-          port: eth0
-        19:
-          uid: talc-86
-          port: eth0
-        20:
-          uid: talc-87
-          port: eth0
-        25:
-          uid: talc-88
-          port: eth0
-        26:
-          uid: talc-89
-          port: eth0
-        27:
-          uid: talc-90
-          port: eth0
-        28:
-          uid: talc-91
-          port: eth0
-        29:
-          uid: talc-92
-          port: eth0
-        30:
-          uid: talc-93
-          port: eth0
-        31:
-          uid: talc-94
-          port: eth0
-        32:
-          uid: talc-95
-          port: eth0
-        33:
-          uid: talc-96
-          port: eth0
-        34:
-          uid: talc-97
-          port: eth0
-        35:
-          uid: talc-98
-          port: eth0
-        36:
-          uid: talc-99
-          port: eth0
-        37:
-          uid: talc-100
-          port: eth0
-        38:
-          uid: talc-101
-          port: eth0
-        39:
-          uid: talc-102
-          port: eth0
-        40:
-          uid: talc-103
-          port: eth0
-        41:
-          uid: talc-104
-          port: eth0
-        42:
-          uid: talc-133
-          port: eth0
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: stalc1
-        2: stalc2
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/net-links/stalc4.yaml b/generators/input/sites/nancy/net-links/stalc4.yaml
deleted file mode 100644
index c09441e044..0000000000
--- a/generators/input/sites/nancy/net-links/stalc4.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
----
-stalc4:
-  model: 3com 4500G
-  kind: switch
-  site: nancy
-  snmp_community: public
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.79.227
-  routes: {}
-  backplane_bps: 176000000000
-  linecards:
-    0:
-      naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        1:
-          uid: talc-105
-          port: eth0
-        2:
-          uid: talc-106
-          port: eth0
-        3:
-          uid: talc-107
-          port: eth0
-        4:
-          uid: talc-108
-          port: eth0
-        5:
-          uid: talc-109
-          port: eth0
-        6:
-          uid: talc-110
-          port: eth0
-        7:
-          uid: talc-111
-          port: eth0
-        8:
-          uid: talc-112
-          port: eth0
-        9:
-          uid: talc-113
-          port: eth0
-        10:
-          uid: talc-114
-          port: eth0
-        11:
-          uid: talc-115
-          port: eth0
-        12:
-          uid: talc-116
-          port: eth0
-        13:
-          uid: talc-117
-          port: eth0
-        14:
-          uid: talc-118
-          port: eth0
-        15:
-          uid: talc-119
-          port: eth0
-        16:
-          uid: talc-120
-          port: eth0
-        17:
-          uid: talc-121
-          port: eth0
-        28:
-          uid: talc-122
-          port: eth0
-        19:
-          uid: talc-123
-          port: eth0
-        20:
-          uid: talc-124
-          port: eth0
-        25:
-          uid: talc-125
-          port: eth0
-        26:
-          uid: talc-126
-          port: eth0
-        27:
-          uid: talc-127
-          port: eth0
-        28:
-          uid: talc-128
-          port: eth0
-        29:
-          uid: talc-129
-          port: eth0
-        30:
-          uid: talc-130
-          port: eth0
-        31:
-          uid: talc-131
-          port: eth0
-        32:
-          uid: talc-132
-          port: eth0
-    1:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: switch
-      rate: 10000000000
-      ports:
-        1: stalc2
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nancy/pdus.rb b/generators/input/sites/nancy/pdus.rb
deleted file mode 100644
index 534424a64b..0000000000
--- a/generators/input/sites/nancy/pdus.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-site :nancy do |site_uid|
-  3.times do |i|
-    pdu "graphene-pdu#{i+7}" do |pdu_uid|
-      vendor "Eaton Corporation"
-      model ""
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0"
-            }
-          }
-        }
-      ]
-    end
-  end
-  6.times do |i|
-    pdu "graphene-pdu#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP7953"
-      sensors [
-        {
-          :power => {
-            :per_outlets => false,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W"
-            }
-          }
-        }
-      ]
-    end
-  end
-  2.times do |i|
-    pdu "griffon-pdu#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP7953"
-      sensors [
-        {
-          :power => {
-            :per_outlets => false,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W"
-            }
-          }
-        }
-      ]
-    end
-  end
-  2.times do |i|
-    pdu "graoully-pdu#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP8653"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
-            }
-          }
-        }
-      ]
-    end
-  end
-  2.times do |i|
-    pdu "grimoire-pdu#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP8653"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
-            }
-          }
-        }
-      ]
-    end
-  end
-  2.times do |i|
-    pdu "grisou-pdu#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP8653"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
-            }
-          }
-        }
-      ]
-    end
-  end
-end
diff --git a/generators/input/sites/nantes/clusters/econome/econome.rb b/generators/input/sites/nantes/clusters/econome/econome.rb
deleted file mode 100644
index 5ae25b8687..0000000000
--- a/generators/input/sites/nantes/clusters/econome/econome.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-site :nantes do |site_uid|
-
-  cluster :econome do |cluster_uid|
-    model "Dell PowerEdge C6220"
-    created_at Time.parse("2014-04-16").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    22.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 14040000000,
-          :node_flops => 207400000000,
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sda', 'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sda', 'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sda', 'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage   => 'HDD'
-        }]
-
-        network_adapters [        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :rate             => 10.G,
-          :device           => "eth0",
-          :enabled          => true,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch_port      => net_port_lookup('nantes', 'econome', node_uid, 'eth0'),
-          :switch           => net_switch_lookup('nantes', 'econome', node_uid, 'eth0'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false,
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => false,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu => false
-        })
-
-        sensors({
-          :power => {
-            :available => false,
-          }
-        })
-
-      end
-    end
-  end
-end
-
diff --git a/generators/input/sites/nantes/clusters/econome/econome_manual.yaml b/generators/input/sites/nantes/clusters/econome/econome_manual.yaml
deleted file mode 100644
index f30855aaa1..0000000000
--- a/generators/input/sites/nantes/clusters/econome/econome_manual.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-econome-1:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/45
-econome-2:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/44
-econome-3:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/15
-econome-4:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/14
-econome-5:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/43
-econome-6:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/42
-econome-7:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/17
-econome-8:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/16
-econome-9:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/41
-econome-10:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/40
-econome-11:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/19
-econome-12:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/18
-econome-13:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/39
-econome-14:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/38
-econome-15:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/21
-econome-16:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/20
-econome-17:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/13
-econome-18:
-  network_interfaces:
-    eth0:
-      switch_name: gw-nantes
-      switch_port: Te0/22
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-1.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-1.yaml
deleted file mode 100644
index 4cfe8bf8d2..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-1:
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:4c
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.1
-      driver: ixgbe
-      mac: a0:36:9f:0e:a1:f4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:4d
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a1:f6
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.1
-      mac: 78:45:c4:f9:15:4e
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial_number: CP2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-10.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-10.yaml
deleted file mode 100644
index e96fa77406..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-10:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:14:b0
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.10
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:80
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:14:b1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:82
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.10
-      mac: 78:45:c4:f9:14:b2
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: G9GYG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-11.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-11.yaml
deleted file mode 100644
index 14ffbe07b0..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-11:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:9a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:9b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.11
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:60
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:62
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.11
-      mac: 78:45:c4:f9:15:9c
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: J9GYG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-12.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-12.yaml
deleted file mode 100644
index 6ce8d2d052..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-12:
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.12
-      mac: 78:45:c4:f9:15:a5
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:a3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:a4
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.12
-      driver: ixgbe
-      mac: a0:36:9f:0e:26:e4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:26:e6
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  chassis:
-    serial_number: H9GYG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-13.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-13.yaml
deleted file mode 100644
index 41fd6dbb37..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-13:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:5a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:5b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.13
-      driver: ixgbe
-      mac: a0:36:9f:0e:23:d4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:23:d6
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.13
-      mac: 78:45:c4:f9:2c:5c
-  main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  chassis:
-    serial_number: HN2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-14.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-14.yaml
deleted file mode 100644
index 0d3df29954..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-14:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: JN2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  main_memory:
-    ram_size: 68719476736
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.14
-      mac: 78:45:c4:f9:2c:71
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:6f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:70
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.14
-      driver: ixgbe
-      mac: a0:36:9f:0e:a2:b8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a2:ba
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-15.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-15.yaml
deleted file mode 100644
index 40041be031..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-econome-15:
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 1P2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:fa:dd:9c
-      rate: 1000000000
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:fa:dd:9d
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.15
-      driver: ixgbe
-      mac: a0:36:9f:01:fd:70
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:01:fd:72
-      mounted: false
-      management: false
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-16.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-16.yaml
deleted file mode 100644
index 1fb418d098..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-16:
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 2P2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.16
-      mac: 78:45:c4:f9:2d:b2
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:b0
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:b1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.16
-      driver: ixgbe
-      mac: a0:36:9f:0e:a7:dc
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a7:de
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  main_memory:
-    ram_size: 68719476736
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-17.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-17.yaml
deleted file mode 100644
index ed8b21df82..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-17:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:33
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:34
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.17
-      driver: ixgbe
-      mac: a0:36:9f:0e:a2:64
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a2:66
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.17
-      mac: 78:45:c4:f9:2c:35
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial_number: 1Q2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-18.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-18.yaml
deleted file mode 100644
index eb091f4357..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-18:
-  main_memory:
-    ram_size: 68719476736
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.18
-      mac: 78:45:c4:f9:2d:73
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:71
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:72
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.18
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:a0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:a2
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  chassis:
-    serial_number: 2Q2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-19.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-19.yaml
deleted file mode 100644
index 59ec21d20c..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-econome-19:
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 04/26/2012
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:46:f1
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.19
-      driver: ixgbe
-      mac: 90:e2:ba:1a:6a:e0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:46:f2
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:6a:e1
-      mounted: false
-      management: false
-  chassis:
-    serial_number: JN30D5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-2.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-2.yaml
deleted file mode 100644
index 40e832d262..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-2:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:88
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:89
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.2
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:38
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:3a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.2
-      mac: 78:45:c4:f9:15:8a
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial_number: DP2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-20.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-20.yaml
deleted file mode 100644
index 00d616e5b6..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-econome-20:
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.20
-      driver: ixgbe
-      mac: 90:e2:ba:1a:6b:3c
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:47:09
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:47:0a
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:6b:3d
-      mounted: false
-      management: false
-  chassis:
-    serial_number: HN30D5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  main_memory:
-    ram_size: 68719476736
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 04/26/2012
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-21.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-21.yaml
deleted file mode 100644
index c59bdfed91..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-econome-21:
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 04/26/2012
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 18:03:73:ff:be:70
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 18:03:73:ff:be:71
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.21
-      driver: ixgbe
-      mac: 90:e2:ba:1a:69:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:69:99
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  chassis:
-    serial_number: 2P30D5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 68719476736
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-22.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-22.yaml
deleted file mode 100644
index eccce8a06a..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-econome-22:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial_number: 1P30D5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:4f:e2
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.22
-      driver: ixgbe
-      mac: 90:e2:ba:1a:69:c0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:4f:e3
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:69:c1
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 04/26/2012
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-3.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-3.yaml
deleted file mode 100644
index 2d19198242..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-3:
-  chassis:
-    serial_number: FP2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:99
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:9a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.3
-      driver: ixgbe
-      mac: a0:36:9f:0e:35:b0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:35:b2
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.3
-      mac: 78:45:c4:f9:2c:9b
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-4.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-4.yaml
deleted file mode 100644
index 607b60101e..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-4:
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: GP2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.4
-      mac: 78:45:c4:f9:2c:c2
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:c0
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:c1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.4
-      driver: ixgbe
-      mac: a0:36:9f:0e:35:a0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:35:a2
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  main_memory:
-    ram_size: 68719476736
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-5.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-5.yaml
deleted file mode 100644
index 8844161a5c..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-5:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:ca
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:cb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.5
-      driver: ixgbe
-      mac: a0:36:9f:0e:2e:c4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:2e:c6
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.5
-      mac: 78:45:c4:f9:16:cc
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  chassis:
-    serial_number: CQ2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-6.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-6.yaml
deleted file mode 100644
index c23f7d5e73..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-6:
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial_number: DQ2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:14:35
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.6
-      driver: ixgbe
-      mac: a0:36:9f:0e:a4:90
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:14:36
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a4:92
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.6
-      mac: 78:45:c4:f9:14:37
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-7.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-7.yaml
deleted file mode 100644
index 4b00eb6add..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-7:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:c4
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.7
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:a8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:c5
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:aa
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.7
-      mac: 78:45:c4:f9:16:c6
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial_number: FQ2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-8.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-8.yaml
deleted file mode 100644
index d79a69b284..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-8:
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.8
-      mac: 78:45:c4:f9:16:c0
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:be
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.8
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:8c
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:bf
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:8e
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 68719476736
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial_number: GQ2YG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
diff --git a/generators/input/sites/nantes/clusters/econome/nodes/econome-9.yaml b/generators/input/sites/nantes/clusters/econome/nodes/econome-9.yaml
deleted file mode 100644
index 61319c6dad..0000000000
--- a/generators/input/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-econome-9:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  main_memory:
-    ram_size: 68719476736
-  block_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  network_interfaces:
-    bmc:
-      ip: 172.17.192.9
-      mac: 78:45:c4:f9:15:cc
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:ca
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:cb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.192.9
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:34
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:36:36
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  chassis:
-    serial_number: F9GYG5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
diff --git a/generators/input/sites/nantes/nantes.rb b/generators/input/sites/nantes/nantes.rb
deleted file mode 100644
index 47c2688e7a..0000000000
--- a/generators/input/sites/nantes/nantes.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :nantes do |site_uid|
-  name "Nantes"
-  location "Nantes, France"
-  web "http://www.mines-nantes.fr"
-  description "Grid5000 Nantes site"
-  latitude 47.282332
-  longitude -1.520547
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.40.0.0/14"
-  virt_ip_range "10.176.0.0/14"
-  storage5k false
-  production true
-
-  g5ksubnet({
-    :network => '10.176.0.0/14',
-    :gateway => '10.179.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.192.0/20',
-      :gateway => '172.16.207.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.207.122'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.207.123'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.207.124'
-    },
-    '4' => {
-      :network => '10.44.0.0/18',
-      :gateway => '10.44.63.254'
-    },
-    '5' => {
-      :network => '10.44.64.0/18',
-      :gateway => '10.44.127.254'
-    },
-    '6' => {
-      :network => '10.44.128.0/18',
-      :gateway => '10.44.191.254'
-    },
-    '7' => {
-      :network => '10.44.192.0/18',
-      :gateway => '10.44.255.254'
-    },
-    '8' => {
-      :network => '10.45.0.0/18',
-      :gateway => '10.45.63.254'
-    },
-    '9' => {
-      :network => '10.45.64.0/18',
-      :gateway => '10.45.127.254'
-    },
-    '21' => {
-      :network => '10.47.192.0/18',
-      :gateway => '10.47.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/nantes/net-links/gw-nantes.yaml b/generators/input/sites/nantes/net-links/gw-nantes.yaml
deleted file mode 100644
index bb15522fcd..0000000000
--- a/generators/input/sites/nantes/net-links/gw-nantes.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-gw-nantes:
-  model: Force10 S4810
-  kind: router
-  site: nantes
-  snmp_community: public
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.192.254
-    "vlan101":
-      addresses:
-        - 172.17.192.0/20
-    "vlan316":
-      mtu: 9180
-      addresses:
-        - 192.168.70.9
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.44.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.44.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.44.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.44.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.45.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.45.64.0/18
-    "vlan721":
-      name: kavlan-21
-      addresses:
-        - 10.47.192.0/18
-  routes: {}
-  backplane_bps: 1280000000000
-  mtu: 1500
-  linecards:
-    0:
-      naming_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      kind: node
-      rate: 10000000000
-      port: eth0
-      ports:
-        0:
-          uid: renater-nantes
-          kind: virtual
-          mtu: 9180
-        45: econome-1
-        44: econome-2
-        15: econome-3
-        14: econome-4
-        43: econome-5
-        42: econome-6
-        16: econome-8
-        17: econome-7
-        41: econome-9
-        40: econome-10
-        19: econome-11
-        18: econome-12
-        39: econome-13
-        38: econome-14
-        21: econome-15
-        20: econome-16
-        13: econome-17
-        22: econome-18
-        29: econome-19
-        28: econome-20
-        31: econome-21
-        30: econome-22
-
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/nantes/pdus.rb b/generators/input/sites/nantes/pdus.rb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-1.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-1.yaml
deleted file mode 100644
index f35bf49af3..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-1.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-1:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:96
-      ip6: fe80::d685:64ff:fe45:b596
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.1
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:b5:97
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:b5:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:b5:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:d1
-      ip: 172.17.160.1
-  chassis:
-    serial_number: GB8043915P
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-10.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-10.yaml
deleted file mode 100644
index 98f141db78..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-10.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-10:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:ca
-      ip6: fe80::d685:64ff:fe45:b5aa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.10
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:d5:cb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:d5:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:d5:e3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:f1
-      ip: 172.17.160.10
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB8043918S
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-11.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-11.yaml
deleted file mode 100644
index b31ea004b1..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-11.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-11:
-  bios:
-    version: O37
-    release_date: 03/01/2012
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 44:1e:a1:53:8d:42
-      ip6: fe80::461e:a1ff:fe53:8d42
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.11
-    eth1:
-      mounted: false
-      mac: 44:1e:a1:53:8d:43
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 44:1e:a1:53:8d:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 44:1e:a1:53:8d:4f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:67:f0
-      ip: 172.17.160.11
-  chassis:
-    serial_number: T421NP0120
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-12.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-12.yaml
deleted file mode 100644
index 1a12c15b4e..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-12.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-12:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:85:30
-      ip6: fe80::d685:64ff:fe45:8530
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.12
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:85:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:85:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:85:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:c9
-      ip: stremi-pdu
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  chassis:
-    serial_number: GB804391F0
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-13.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-13.yaml
deleted file mode 100644
index 1084638602..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-13.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-13:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:e5:1c
-      ip6: fe80::d685:64ff:fe45:e51c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.13
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:e5:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:d5:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:d5:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:f6
-      ip: 172.17.160.13
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390R1
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-14.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-14.yaml
deleted file mode 100644
index 46fb11cfbe..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-14.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-14:
-  bios:
-    version: O37
-    release_date: 03/01/2012
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 44:1e:a1:53:8d:70
-      ip6: fe80::461e:a1ff:fe53:8d70
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.14
-    eth1:
-      mounted: false
-      mac: 44:1e:a1:53:8d:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 44:1e:a1:53:8d:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 44:1e:a1:53:8d:73
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: e8:39:35:af:48:14
-      ip: 172.17.160.14
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: T421NP0071
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-15.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-15.yaml
deleted file mode 100644
index f97a2aacaf..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-15.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-15:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:65:08
-      ip6: fe80::d685:64ff:fe45:6508
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.15
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:65:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:65:74
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:65:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:67
-      ip: 172.17.160.15
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390W8
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-16.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-16.yaml
deleted file mode 100644
index 61a0b4153b..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-16.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-16:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:75:b2
-      ip6: fe80::d685:64ff:fe45:75b2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.16
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:75:b3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:c5:c0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:c5:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:fa
-      ip: 172.17.160.16
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390VM
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-17.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-17.yaml
deleted file mode 100644
index 85dddbe597..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-17.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-17:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:6e:14:10
-      ip6: fe80::1ec1:deff:fe6e:1410
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.17
-    eth1:
-      mounted: false
-      mac: 1c:c1:de:6e:14:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 1c:c1:de:6e:14:0e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 1c:c1:de:6e:14:0f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:f1:f0
-      ip: 172.17.160.17
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB80439150
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-18.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-18.yaml
deleted file mode 100644
index 228d50b28e..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-18.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-18:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:b7:9c
-      ip6: fe80::d685:64ff:fe44:b79c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.18
-    eth1:
-      mounted: false
-      mac: d4:85:64:44:b7:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:44:b7:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:44:b7:a3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:7d
-      ip: 172.17.160.18
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390T7
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 49392123904
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-19.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-19.yaml
deleted file mode 100644
index cee3b63994..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-19.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-19:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:6e
-      ip6: fe80::d685:64ff:fe45:b56e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.19
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:b5:6f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:a5:fc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:a5:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:33
-      ip: 172.17.160.19
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390TR
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-2.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-2.yaml
deleted file mode 100644
index adbde1b3f7..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-2.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-2:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:94
-      ip6: fe80::d685:64ff:fe45:794
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.2
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:07:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:07:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:07:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:8b
-      ip: 172.17.160.2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390S8
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-20.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-20.yaml
deleted file mode 100644
index d2047f5220..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-20.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-20:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:eb:38:a2
-      ip6: fe80::1ec1:deff:feeb:38a2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.20
-    eth1:
-      mounted: false
-      mac: 1c:c1:de:eb:38:a3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 1c:c1:de:eb:38:7a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 1c:c1:de:eb:38:7b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:87:41
-      ip: 172.17.160.20
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB80439168
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-21.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-21.yaml
deleted file mode 100644
index a1b82adc24..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-21.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-21:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:fe
-      ip6: fe80::d685:64ff:fe45:d5fe
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.21
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:d5:ff
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:d5:fc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:d5:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:46:05
-      ip: 172.17.160.21
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390YT
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-22.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-22.yaml
deleted file mode 100644
index 0de7f59351..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-22.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-22:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:f5:74
-      ip6: fe80::d685:64ff:fe45:f574
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.22
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:f5:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:f5:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:f5:73
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:3e
-      ip: 172.17.160.22
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390WL
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-23.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-23.yaml
deleted file mode 100644
index c63c07e41c..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-23.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-23:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:20
-      ip6: fe80::d685:64ff:fe45:720
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.23
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:07:21
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:07:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:07:57
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:45
-      ip: 172.17.160.23
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  chassis:
-    serial_number: GB804390JC
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-24.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-24.yaml
deleted file mode 100644
index 18883ccd98..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-24.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-24:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:f6:9e
-      ip6: fe80::d685:64ff:fe45:f69e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.24
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:f6:9f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:f6:9c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:f6:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:d7
-      ip: 172.17.160.24
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390HC
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-25.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-25.yaml
deleted file mode 100644
index 50785bcb60..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-25.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-25:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:aa
-      ip6: fe80::d685:64ff:fe45:b5aa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.25
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:b5:ab
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:b5:a8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:b5:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:e8
-      ip: 172.17.160.25
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390RP
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-26.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-26.yaml
deleted file mode 100644
index c365251e7e..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-26.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-26:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:a5:44
-      ip6: fe80::d685:64ff:fe45:a544
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.26
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:a5:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:a5:48
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:a5:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:17
-      ip: 172.17.160.26
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  chassis:
-    serial_number: GB804391C4
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-27.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-27.yaml
deleted file mode 100644
index 84750d7b0b..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-27.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-27:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:e8:2b:0c
-      ip6: fe80::1ec1:deff:fee8:2b0c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.27
-    eth1:
-      mounted: false
-      mac: 1c:c1:de:e8:2b:0d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 1c:c1:de:e8:2b:12
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 1c:c1:de:e8:2b:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac:
-      ip: 172.17.160.27
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB8043917X
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-28.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-28.yaml
deleted file mode 100644
index bfa81fd7a0..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-28.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-28:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:55:f0
-      ip6: fe80::d685:64ff:fe45:55f0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.28
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:55:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:55:b6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:55:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:12
-      ip: 172.17.160.28
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB80439174
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-29.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-29.yaml
deleted file mode 100644
index 3f50b8e199..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-29.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-29:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:f2:f2
-      ip6: fe80::7ae7:d1ff:fefa:f2f2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.29
-    eth1:
-      mounted: false
-      mac: 78:e7:d1:fa:f2:f3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:fa:03:50
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:fa:03:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:f7:09:93
-      ip: 172.17.160.29
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB8043912D
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-3.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-3.yaml
deleted file mode 100644
index dad791ea32..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-3.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-3:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:77:4a
-      ip6: fe80::d685:64ff:fe44:774a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.3
-    eth1:
-      mounted: false
-      mac: d4:85:64:44:77:4b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:44:77:48
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:44:77:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:46:2d
-      ip: 172.17.160.3
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390XD
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-30.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-30.yaml
deleted file mode 100644
index e92d9943cb..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-30.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-30:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:b6
-      ip6: fe80::d685:64ff:fe45:c5b6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.30
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:c5:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:c5:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:c5:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:fd
-      ip: 172.17.160.30
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB80439102
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-31.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-31.yaml
deleted file mode 100644
index 174d3923ed..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-31.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-31:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:e5:ce
-      ip6: fe80::d685:64ff:fe45:e5ce
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.31
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:e5:cf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:e5:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:e5:cb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:be
-      ip: 172.17.160.31
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB8043910P
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-32.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-32.yaml
deleted file mode 100644
index 1d1e1fde22..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-32.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-32:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:d0
-      ip6: fe80::d685:64ff:fe45:c5d0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.32
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:c5:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:d5:0e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:d5:0f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:1d
-      ip: 172.17.160.32
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390V1
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-33.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-33.yaml
deleted file mode 100644
index 0e785a8bbf..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-33.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-33:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:e8:fa:84
-      ip6: fe80::1ec1:deff:fee8:fa84
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.33
-    eth1:
-      mounted: false
-      mac: 1c:c1:de:e8:fa:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 1c:c1:de:e8:fa:88
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 1c:c1:de:e8:fa:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:12:03
-      ip: 172.17.160.33
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB8043912Y
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-34.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-34.yaml
deleted file mode 100644
index 87795fe826..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-34.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-34:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:65:fa
-      ip6: fe80::d685:64ff:fe45:65fa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.34
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:65:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:65:f0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:65:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:88
-      ip: 172.17.160.34
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB8043911H
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-35.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-35.yaml
deleted file mode 100644
index e84954eea8..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-35.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-35:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:a0
-      ip6: fe80::d685:64ff:fe45:c5a0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.35
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:c5:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:c5:8e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:c5:8f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:db
-      ip: 172.17.160.35
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390SR
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-36.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-36.yaml
deleted file mode 100644
index c25bea0715..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-36.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-36:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:c4
-      ip6: fe80::d685:64ff:fe45:7c4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.36
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:07:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:07:c2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:07:c3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:58
-      ip: 172.17.160.36
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804391DA
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 47244640256
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-37.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-37.yaml
deleted file mode 100644
index 4139bdfb77..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-37.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-37:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:42
-      ip6: fe80::d685:64ff:fe45:d542
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.37
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:d5:43
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:d5:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:d5:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:4b
-      ip: 172.17.160.37
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804391BD
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-38.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-38.yaml
deleted file mode 100644
index a68145f0bf..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-38.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-38:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:6e:14:e6
-      ip6: fe80::1ec1:deff:fe6e:14e6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.38
-    eth1:
-      mounted: false
-      mac: 1c:c1:de:6e:14:e7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 1c:c1:de:6e:14:ec
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 1c:c1:de:6e:14:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:02:3f
-      ip: 172.17.160.38
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB80439141
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-39.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-39.yaml
deleted file mode 100644
index bf35c1bffb..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-39.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-39:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:a6
-      ip6: fe80::d685:64ff:fe45:7a6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.39
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:07:a7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:07:1e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:07:1f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:d1
-      ip: 172.17.160.39
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390N3
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 49392123904
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-4.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-4.yaml
deleted file mode 100644
index 88967c6de6..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-4.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-4:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:d4
-      ip6: fe80::d685:64ff:fe45:c5d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.4
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:c5:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:c5:c8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:c5:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:1a
-      ip: 172.17.160.4
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  chassis:
-    serial_number: GB804391AS
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-40.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-40.yaml
deleted file mode 100644
index 265f580080..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-40.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-40:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:17:d6
-      ip6: fe80::d685:64ff:fe45:17d6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.40
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:17:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:17:c8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:17:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:30
-      ip: 172.17.160.40
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804391DP
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-41.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-41.yaml
deleted file mode 100644
index 4a1036afdd..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-41.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-41:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:77:28
-      ip6: fe80::d685:64ff:fe44:7728
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.41
-    eth1:
-      mounted: false
-      mac: d4:85:64:44:77:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:44:77:24
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:44:77:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:46:2f
-      ip: 172.17.160.41
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390P1
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-42.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-42.yaml
deleted file mode 100644
index 92854413d9..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-42.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-42:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:c7:8e
-      ip6: fe80::d685:64ff:fe44:c78e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.42
-    eth1:
-      mounted: false
-      mac: d4:85:64:44:c7:8f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:44:b7:9a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:44:b7:9b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:c4
-      ip: 172.17.160.42
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804391A2
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-43.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-43.yaml
deleted file mode 100644
index f3e639dbf0..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-43.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-43:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:fc
-      ip6: fe80::d685:64ff:fe45:b5fc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.43
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:b5:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:b5:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:b5:ef
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:eb
-      ip: 172.17.160.43
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390L2
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-44.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-44.yaml
deleted file mode 100644
index fb95008a7a..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-44.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-44:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:17:ce
-      ip6: fe80::d685:64ff:fe45:17ce
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.44
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:17:cf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:17:cc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:17:cd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:db
-      ip: 172.17.160.44
-  chassis:
-    serial_number: GB8043919A
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-5.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-5.yaml
deleted file mode 100644
index b0aea9bedb..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-5.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-5:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:12
-      ip6: fe80::d685:64ff:fe45:d512
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.5
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:d5:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:d5:50
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:d5:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:40
-      ip: 172.17.160.5
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390PM
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-6.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-6.yaml
deleted file mode 100644
index d0b9aae906..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-6.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-6:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:f5:26
-      ip6: fe80::d685:64ff:fe45:b5aa
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.6
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:f5:27
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:e5:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:e5:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:ca
-      ip: 172.17.160.6
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804390XX
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-7.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-7.yaml
deleted file mode 100644
index 87ed04a76c..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-7.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-7:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:95:4c
-      ip6: fe80::d685:64ff:fe45:954c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.7
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:95:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:95:4a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:95:4b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:e5
-      ip: 172.17.160.7
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB804391EK
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-8.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-8.yaml
deleted file mode 100644
index 09e367dc0a..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-8.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-8:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:65:de
-      ip6: fe80::d685:64ff:fe45:65de
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.8
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:65:df
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:65:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:65:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:64
-      ip: 172.17.160.8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB80439116
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/nodes/stremi-9.yaml b/generators/input/sites/reims/clusters/stremi/nodes/stremi-9.yaml
deleted file mode 100644
index ecd1ca3c57..0000000000
--- a/generators/input/sites/reims/clusters/stremi/nodes/stremi-9.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-stremi-9:
-  bios:
-    version: O37
-    release_date: 01/26/2011
-    vendor: HP
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:85:32
-      ip6: fe80::d685:64ff:fe45:8532
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.160.9
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:85:33
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:85:c0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:85:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:b3
-      ip: 172.17.160.9
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB804390M4
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/reims/clusters/stremi/stremi.rb b/generators/input/sites/reims/clusters/stremi/stremi.rb
deleted file mode 100644
index 8cf3a00c43..0000000000
--- a/generators/input/sites/reims/clusters/stremi/stremi.rb
+++ /dev/null
@@ -1,166 +0,0 @@
-site :reims do |site_uid|
-
-  cluster :stremi do |cluster_uid|
-    model "HP ProLiant DL165 G7"
-    created_at Time.parse("2011-04-18").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    44.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 4931000000,
-        :node_flops => 121300000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('reims', 'stremi', node_uid),
-          :switch_port      => net_port_lookup('reims', 'stremi', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 1.G,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :api => { :metric => 'power' },
-              :pdu => [ {
-                :uid  => lookup('stremi_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('stremi_manual', node_uid, 'pdu', 'pdu_position'),
-              } ]
-            }
-          }
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/reims/clusters/stremi/stremi_manual.yaml b/generators/input/sites/reims/clusters/stremi/stremi_manual.yaml
deleted file mode 100644
index 88feeee6a1..0000000000
--- a/generators/input/sites/reims/clusters/stremi/stremi_manual.yaml
+++ /dev/null
@@ -1,353 +0,0 @@
----
-stremi-1:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/1
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 1
-stremi-2:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/2
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 2
-stremi-3:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/3
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 3
-stremi-4:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/4
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 4
-stremi-5:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/5
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 5
-stremi-6:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/6
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 6
-stremi-7:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/7
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 7
-stremi-8:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/8
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 8
-stremi-9:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/9
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 9
-stremi-10:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/10
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 10
-stremi-11:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/11
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 11
-stremi-12:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/12
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 12
-stremi-13:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/13
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 13
-stremi-14:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/14
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 14
-stremi-15:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/15
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 15
-stremi-16:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/16
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 16
-stremi-17:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/17
-  pdu:
-    pdu_name: stremi-pdu2
-    pdu_position: 17
-stremi-18:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/18
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 1
-stremi-19:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/19
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 2
-stremi-20:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/20
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 3
-stremi-21:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/21
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 4
-stremi-22:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/22
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 5
-stremi-23:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/23
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 6
-stremi-24:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/24
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 7
-stremi-25:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/25
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 8
-stremi-26:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/26
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 9
-stremi-27:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/27
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 10
-stremi-28:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/28
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 11
-stremi-29:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/29
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 12
-stremi-30:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/30
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 13
-stremi-31:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/31
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 14
-stremi-32:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/32
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 15
-stremi-33:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/34
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 16
-stremi-34:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/33
-  pdu:
-    pdu_name: stremi-pdu1
-    pdu_position: 17
-stremi-35:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/35
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 1
-stremi-36:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/36
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 2
-stremi-37:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/37
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 3
-stremi-38:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/38
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 4
-stremi-39:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/39
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 5
-stremi-40:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/40
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 6
-stremi-41:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/41
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 7
-stremi-42:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/42
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 8
-stremi-43:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/43
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 9
-stremi-44:
-  network_interfaces:
-    eth0:
-      switch_name: gw-reims
-      switch_port: Gi0/44
-  pdu:
-    pdu_name: stremi-pdu3
-    pdu_position: 10
diff --git a/generators/input/sites/reims/net-links/gw-reims.yaml b/generators/input/sites/reims/net-links/gw-reims.yaml
deleted file mode 100644
index eddf5f53a1..0000000000
--- a/generators/input/sites/reims/net-links/gw-reims.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
----
-gw-reims:
-  model: Cisco C3560E-48TD-S
-  kind: router
-  site: reims
-  snmp_community: public
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.175.254
-    "vlan101":
-      addresses:
-        - 172.17.175.254
-    "vlan540":
-      addresses:
-        - 192.168.69.9
-    "vlan541":
-      addresses:
-        - 192.168.69.1
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.36.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.36.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.36.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.36.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.37.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.37.64.0/18
-    "vlan719":
-      name: kavlan-19
-      addresses:
-        - 10.39.192.0/18
-  routes: {}
-  backplane_bps: 128000000000
-  mtu: 9198
-  linecards:
-    0:
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      kind: node
-      rate: 1000000000
-      ports:
-        1: stremi-1
-        2: stremi-2
-        3: stremi-3
-        4: stremi-4
-        5: stremi-5
-        6: stremi-6
-        7: stremi-7
-        8: stremi-8
-        9: stremi-9
-        10: stremi-10
-        11: stremi-11
-        12: stremi-12
-        13: stremi-13
-        14: stremi-14
-        15: stremi-15
-        16: stremi-16
-        17: stremi-17
-        18: stremi-18
-        19: stremi-19
-        20: stremi-20
-        21: stremi-21
-        22: stremi-22
-        23: stremi-23
-        24: stremi-24
-        25: stremi-25
-        26: stremi-26
-        27: stremi-27
-        28: stremi-28
-        29: stremi-29
-        30: stremi-30
-        31: stremi-31
-        32: stremi-32
-        34: stremi-33
-        33: stremi-34
-        35: stremi-35
-        36: stremi-36
-        37: stremi-37
-        38: stremi-38
-        39: stremi-39
-        40: stremi-40
-        41: stremi-41
-        42: stremi-42
-        43: stremi-43
-        44: stremi-44
-        49:
-          kind: virtual
-          uid: renater-reims
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Port-channel%CHANNELID%
diff --git a/generators/input/sites/reims/pdus.rb b/generators/input/sites/reims/pdus.rb
deleted file mode 100644
index 1bf4d85831..0000000000
--- a/generators/input/sites/reims/pdus.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-site :reims do |site_uid|
-  3.times do |i|
-    pdu "stremi-pdu#{i+1}" do |pdu_uid|
-      vendor "Raritan"
-      model ""
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => "iso.3.6.1.4.1.13742.4.1.3.1.3.0",
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.13742.4.1.2.2.1.7"
-            }
-          }
-        }
-      ]
-    end
-  end
-end
diff --git a/generators/input/sites/reims/reims.rb b/generators/input/sites/reims/reims.rb
deleted file mode 100644
index ef9a4b06f7..0000000000
--- a/generators/input/sites/reims/reims.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :reims do |site_uid|
-  name "Reims"
-  location "Reims, France"
-  web "http://www.grid5000.fr/mediawiki/index.php/Reims:Home"
-  description "Grid5000 Reims site"
-  latitude 49.244508
-  longitude 4.062714
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.36.0.0/14"
-  virt_ip_range "10.168.0.0/14"
-  storage5k false
-  production true
-
-  g5ksubnet({
-    :network => '10.168.0.0/14',
-    :gateway => '10.171.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.160.0/20',
-      :gateway => '172.16.175.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.175.121'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.175.122'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.175.123'
-    },
-    '4' => {
-      :network => '10.36.0.0/18',
-      :gateway => '10.36.63.254'
-    },
-    '5' => {
-      :network => '10.36.64.0/18',
-      :gateway => '10.36.127.254'
-    },
-    '6' => {
-      :network => '10.36.128.0/18',
-      :gateway => '10.36.191.254'
-    },
-    '7' => {
-      :network => '10.36.192.0/18',
-      :gateway => '10.36.255.254'
-    },
-    '8' => {
-      :network => '10.37.0.0/18',
-      :gateway => '10.37.63.254'
-    },
-    '9' => {
-      :network => '10.37.64.0/18',
-      :gateway => '10.37.127.254'
-    },
-    '19' => {
-      :network => '10.39.192.0/18',
-      :gateway => '10.39.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
deleted file mode 100644
index 0a0915f23b..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-paranoia-1:
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  block_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  main_memory:
-    ram_size: 137438953472
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  chassis:
-    serial_number: 9N20LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:45
-      rate: 1000000000
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:46
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.1
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:d0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:d2
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.1
-      mac: f0:4d:a2:73:cf:47
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
deleted file mode 100644
index 07867e353c..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-paranoia-2:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  block_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  network_interfaces:
-    bmc:
-      ip: 172.17.100.2
-      mac: f0:4d:a2:73:cc:7a
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:78
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:79
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.2
-      driver: ixgbe
-      mac: a0:36:9f:28:a8:80
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a8:82
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  chassis:
-    serial_number: DB12LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  main_memory:
-    ram_size: 137438953472
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
deleted file mode 100644
index 5c19a50be3..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
----
-paranoia-3:
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  chassis:
-    serial_number: 9PJ4LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  network_interfaces:
-    bmc:
-      ip: 172.17.100.3
-      mac: f0:4d:a2:74:06:b8
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:74:06:b6
-      rate: 1000000000
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:74:06:b7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.3
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:d4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:d6
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6002BKTG
-      rev: D1P3
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
deleted file mode 100644
index 00e672690e..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-paranoia-4:
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:2a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.4
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:b0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:2b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:b2
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.4
-      mac: f0:4d:a2:73:cf:2c
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  chassis:
-    serial_number: BVY4LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  main_memory:
-    ram_size: 137438953472
-  block_devices:
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6002BKTG
-      rev: D1P3
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
deleted file mode 100644
index 98e965a43c..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-paranoia-5:
-  network_interfaces:
-    bmc:
-      ip: 172.17.100.5
-      mac: f0:4d:a2:73:cc:71
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:6f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:70
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.5
-      driver: ixgbe
-      mac: a0:36:9f:28:a7:b8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a7:ba
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 137438953472
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  block_devices:
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 9912LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
deleted file mode 100644
index 7aad3aed9e..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-paranoia-6:
-  main_memory:
-    ram_size: 137438953472
-  chassis:
-    serial_number: 8TY4LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ce:22
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.6
-      driver: ixgbe
-      mac: a0:36:9f:28:a7:b4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ce:23
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a7:b6
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.6
-      mac: f0:4d:a2:73:ce:24
-  block_devices:
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
deleted file mode 100644
index abaeccb55a..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-paranoia-7:
-  chassis:
-    serial_number: 5M20LZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.7
-      driver: ixgbe
-      mac: a0:36:9f:28:a9:14
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ca:ad
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ca:ae
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a9:16
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.7
-      mac: f0:4d:a2:73:ca:af
-  block_devices:
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  main_memory:
-    ram_size: 137438953472
diff --git a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
deleted file mode 100644
index bc8b197d4a..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-paranoia-8:
-  block_devices:
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6002BKTG
-      rev: D1P3
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  chassis:
-    serial_number: D14YKZ1
-    manufacturer: Dell Inc.
-    product_name: PowerEdge C6220 II
-  supported_job_types:
-    virtual: ivt
-  network_interfaces:
-    bmc:
-      ip: 172.17.100.8
-      mac: f0:4d:a2:73:ce:3f
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ce:3d
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.8
-      driver: ixgbe
-      mac: a0:36:9f:28:a9:18
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ce:3e
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a9:1a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/paranoia/paranoia.rb b/generators/input/sites/rennes/clusters/paranoia/paranoia.rb
deleted file mode 100644
index f7c20b39c6..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/paranoia.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-site :rennes do |site_uid|
-
-  cluster :paranoia do |cluster_uid|
-    model "Dell PowerEdge C6220 II"
-    created_at Time.parse("2014-02-21").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    8.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-         :core_flops => 13800000000,
-         :node_flops => 260000000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdd',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdd',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdd',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdd', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sde',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sde',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sde',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sde', 'rev'),
-          :storage   => 'HDD'
-        }]
-
-        network_adapters [        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :rate             => 10.G,
-          :device           => "eth0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch_port      => net_port_lookup('rennes', 'paranoia', node_uid, 'eth0'),
-          :switch           => net_switch_lookup('rennes', 'paranoia', node_uid, 'eth0')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => true,
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-          :switch_port      => net_port_lookup('rennes', 'paranoia', node_uid, 'eth2'),
-          :switch           => net_switch_lookup('rennes', 'paranoia', node_uid, 'eth2')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu => false
-        })
-
-        monitoring({
-          :wattmeter => false,
-        })
-
-        sensors({
-          :power => {
-            :available => false,
-          }
-        })
-
-      end # node
-
-    end # 8.times
-
-  end # cluster
-
-end # site
diff --git a/generators/input/sites/rennes/clusters/paranoia/paranoia_manual.yaml b/generators/input/sites/rennes/clusters/paranoia/paranoia_manual.yaml
deleted file mode 100644
index 894ebfce95..0000000000
--- a/generators/input/sites/rennes/clusters/paranoia/paranoia_manual.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-paranoia-1:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/47
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi3/3
-paranoia-2:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/46
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi3/9
-paranoia-3:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/23
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi2/3
-paranoia-4:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/22
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi3/1
-paranoia-5:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/45
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi3/7
-paranoia-6:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/44
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi3/10
-paranoia-7:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/21
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi2/6
-paranoia-8:
-  network_interfaces:
-    eth0:
-      switch_name: bigdata-sw
-      switch_port: Te0/20
-    eth2:
-      switch_name: gw-rennes
-      switch_port: Gi3/13
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
deleted file mode 100644
index cfc07f7f35..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-1:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ad
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9ead
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.1
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:97:0e
-      ip: 172.17.98.1
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:97:0c
-      ip6: fe80::214:4fff:feca:970c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.1
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:97:0d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF04D
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
deleted file mode 100644
index 8d4c2b3864..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-10:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:45
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:6d45
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.10
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:98:4e
-      ip: 172.17.98.10
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:46
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:98:4c
-      ip6: fe80::214:4fff:feca:984c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.10
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:98:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  chassis:
-    serial_number: 0935XEF046
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
deleted file mode 100644
index c473808937..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-11:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:75
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9475
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.11
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:76
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:9a:e2
-      ip: 172.17.98.11
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:9a:e0
-      ip6: fe80::214:4fff:feca:9ae0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.11
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:9a:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF055
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
deleted file mode 100644
index 7d2ef5736f..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-12:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:55
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9f55
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.12
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:56
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:26
-      ip: 172.17.98.12
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:24
-      ip6: fe80::214:4fff:feca:9924
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.12
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:99:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0935XEF042
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
deleted file mode 100644
index b07bfdc639..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-13:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:61
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9461
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.13
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:62
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:9a:82
-      ip: 172.17.98.13
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:9a:80
-      ip6: fe80::214:4fff:feca:9a80
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.13
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:9a:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF059
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-14.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
deleted file mode 100644
index 8a099ec01e..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-14:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:11
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9511
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:12
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:be
-      ip: 172.17.98.14
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:bc
-      ip6: fe80::214:4fff:feca:99bc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.14
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:99:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF054
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-15.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
deleted file mode 100644
index d7554b61c0..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-15:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:e9
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:94e9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.15
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:8f:02
-      ip: 172.17.98.15
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:ea
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:8f:00
-      ip6: fe80::214:4fff:feca:8f00
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.15
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:8f:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: 0935XEF058
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
deleted file mode 100644
index 1be026e51e..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-16:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:aa:d9
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:aad9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.16
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:aa:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:94:b6
-      ip: 172.17.98.16
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:94:b4
-      ip6: fe80::214:4fff:feca:94b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.16
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:94:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0935XEF04F
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC4A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-17.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
deleted file mode 100644
index 3c61b74568..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-17:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:59
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9459
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.17
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:98:6e
-      ip: 172.17.98.17
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:98:6c
-      ip6: fe80::221:28ff:fe40:3c3a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.17
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:98:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  chassis:
-    serial_number: 0935XEF048
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
deleted file mode 100644
index 4ca37a7e7c..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-18:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:e9
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9ee9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.18
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:99:aa
-      ip: 172.17.98.18
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ea
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:a8
-      ip6: fe80::214:4fff:feca:99a8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.18
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:99:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  chassis:
-    serial_number: 0935XEF044
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
deleted file mode 100644
index bf57a9ef15..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-19:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:67:39
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:6739
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.19
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:21:28:40:3c:3c
-      ip: 172.17.98.19
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:67:3a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:21:28:40:3c:3a
-      ip6: fe80::221:28ff:fe40:3c3a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.19
-    eth1:
-      mounted: false
-      mac: 00:21:28:40:3c:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  chassis:
-    serial_number: 0935XEF04E
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
deleted file mode 100644
index c32fcf0725..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-2:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:71
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9471
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.2
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:72
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:7e
-      ip: 172.17.98.2
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:7c
-      ip6: fe80::214:4fff:feca:997c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.2
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:99:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF052
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
deleted file mode 100644
index 2db2baf9e8..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-20:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e5
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9fe5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.20
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:2e
-      ip: 172.17.98.20
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:2c
-      ip6: fe80::214:4fff:feca:922c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.20
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:92:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF053
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
deleted file mode 100644
index ff443253e4..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-21:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:c5
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:abc5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.21
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:4d:7a
-      ip: 172.17.98.21
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:c6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:4d:78
-      ip6: fe80::214:4fff:feca:4d78
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.21
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:4d:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: 0935XEF049
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-22.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
deleted file mode 100644
index add455fb50..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-22:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e1
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:6739
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.22
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:8e:f6
-      ip: 172.17.98.22
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:8e:f4
-      ip6: fe80::221:28ff:fe40:3c3a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.22
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:8e:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  chassis:
-    serial_number: 0935XEF043
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-23.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
deleted file mode 100644
index ca6ccfb671..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-23:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:99
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:ab99
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:de
-      ip: 172.17.98.23
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:dc
-      ip6: fe80::214:4fff:feca:99dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.23
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:99:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF057
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
deleted file mode 100644
index d100d3477e..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-24:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:fd
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:94fd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.24
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:92:3a
-      ip: 172.17.98.24
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:38
-      ip6: fe80::214:4fff:feca:9238
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.24
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:92:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF056
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
deleted file mode 100644
index 6371c9401d..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-25:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:49
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9f49
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.25
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:91:62
-      ip: 172.17.98.25
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:91:60
-      ip6: fe80::214:4fff:feca:9160
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.25
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:91:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: 0935XEF04C
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
deleted file mode 100644
index 957b43900b..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-3:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:dd
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9edd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:de
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:6e
-      ip: 172.17.98.3
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:6c
-      ip6: fe80::214:4fff:feca:926c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.3
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:92:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: 0935XEF041
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
deleted file mode 100644
index 683193faf4..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-4:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b5
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:69b5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.4
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:97:7a
-      ip: 172.17.98.4
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:97:78
-      ip6: fe80::214:4fff:feca:9778
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.4
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:97:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: 0935XEF047
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
deleted file mode 100644
index 26c6f98371..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-5:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:a1
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:6da1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.5
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:a2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:94:72
-      ip: 172.17.98.5
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:94:70
-      ip6: fe80::214:4fff:feca:9470
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.5
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:94:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: 0935XEF051
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
deleted file mode 100644
index e9ad34ac00..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-6:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:bd
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9fbd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.6
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:be
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:32
-      ip: 172.17.98.6
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:30
-      ip6: fe80::214:4fff:feca:9230
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.6
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:92:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0935XEF04B
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
deleted file mode 100644
index 0424c90aeb..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-7:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:80:f1
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:80f1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.7
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:a7:2a
-      ip: 172.17.98.7
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:80:f2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:a7:28
-      ip6: fe80::214:4fff:feca:a728
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.7
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:a7:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0935XEF050
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
deleted file mode 100644
index 3258933653..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-8:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:55
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9455
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.8
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:56
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:b6
-      ip: 172.17.98.8
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:b4
-      ip6: fe80::214:4fff:feca:92b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.8
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:92:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  chassis:
-    serial_number: 0935XEF045
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/generators/input/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
deleted file mode 100644
index c680316d9e..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-parapide-9:
-  bios:
-    version: '1.14'
-    release_date: 08/04/2009
-    vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:b1
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9eb1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.9
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:98:a2
-      ip: 172.17.98.9
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:b2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:98:a0
-      ip6: fe80::214:4fff:feca:98a0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.9
-    eth1:
-      mounted: false
-      mac: 00:14:4f:ca:98:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 0935XEF04A
-    manufacturer: Sun Microsystems
-    product_name: SUN FIRE X2270
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/generators/input/sites/rennes/clusters/parapide/parapide.rb b/generators/input/sites/rennes/clusters/parapide/parapide.rb
deleted file mode 100644
index 998d364bb7..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/parapide.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-site :rennes do |site_uid|
-
-  cluster :parapide do |cluster_uid|
-    model "SUN FIRE X2270"
-    created_at Time.parse("2010-01-25").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    25.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 9170000000,
-        :node_flops => 71150000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => "Intel",
-          :version          => "82575EB",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('rennes', 'parapide', node_uid),
-          :switch_port      => net_port_lookup('rennes', 'parapide', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => "82575EB",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT25418",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-          :device           => "ib1",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT25418",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial        => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name          => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer  => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        monitoring({
-          :temperature  => true
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :api      => { :metric => 'power' },
-              :pdu      => [{ :uid => lookup('parapide_manual', node_uid, 'pdu', 'pdu_name') }],
-            }
-          },
-          :temperature => {
-            :available => true,
-            :via => {
-              :api  => { :metric => "ambient_temp" },
-              :ipmi     => { :sensors => { :ambient => "/MB/T_AMB" } }
-            }
-          }
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/rennes/clusters/parapide/parapide_manual.yaml b/generators/input/sites/rennes/clusters/parapide/parapide_manual.yaml
deleted file mode 100644
index aa69fe2829..0000000000
--- a/generators/input/sites/rennes/clusters/parapide/parapide_manual.yaml
+++ /dev/null
@@ -1,176 +0,0 @@
----
-parapide-1:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/47
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-2:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/48
-  pdu:
-    pdu_name: parapide-pdu-3
-parapide-3:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/34
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-4:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/46
-  pdu:
-    pdu_name: parapide-pdu-3
-parapide-5:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/44
-  pdu:
-    pdu_name: parapide-pdu-3
-parapide-6:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/39
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-7:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/40
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-8:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/42
-  pdu:
-    pdu_name: parapide-pdu-3
-parapide-9:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/41
-  pdu:
-    pdu_name: parapide-pdu-3
-parapide-10:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/43
-  pdu:
-    pdu_name: parapide-pdu-3
-parapide-11:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/45
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-12:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/48
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-13:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/47
-  pdu:
-    pdu_name: parapide-pdu-4
-parapide-14:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/44
-  pdu:
-    pdu_name: parapide-pdu-1
-parapide-15:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/46
-  pdu:
-    pdu_name: parapide-pdu-2
-parapide-16:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/42
-  pdu:
-    pdu_name: parapide-pdu-1
-parapide-17:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/41
-  pdu:
-    pdu_name: parapide-pdu-2
-parapide-18:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/39
-  pdu:
-    pdu_name: parapide-pdu-1
-parapide-19:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/40
-  pdu:
-    pdu_name: parapide-pdu-2
-parapide-20:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/43
-  pdu:
-    pdu_name: parapide-pdu-1
-parapide-21:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/36
-  pdu:
-    pdu_name: parapide-pdu-2
-parapide-22:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/38
-  pdu:
-    pdu_name: parapide-pdu-1
-parapide-23:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/37
-  pdu:
-    pdu_name: parapide-pdu-2
-parapide-24:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi6/37
-  pdu:
-    pdu_name: parapide-pdu-1
-parapide-25:
-  network_interfaces:
-    eth0:
-      switch_name: gw-rennes
-      switch_port: Gi7/38
-  pdu:
-    pdu_name: parapide-pdu-2
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
deleted file mode 100644
index c74b1e8a90..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-1:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:0f
-      rate: 20000000000
-      ip6: fe80::202:c903:6:ba0f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.1
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:23
-      ip: 172.17.99.1
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:10
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:ef:22
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:ef:23
-      ip6: fe80::7ae7:d1ff:fef5:ef23
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.1
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:3f:30
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:3f:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651KY
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
deleted file mode 100644
index 8d1ed4207c..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-10:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1b
-      rate: 20000000000
-      ip6: fe80::202:c903:6:ba1b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.10
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:58:23:f2
-      ip: 172.17.99.10
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1c
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:88
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:89
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.10
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:a5:98
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:a5:99
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651KK
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
deleted file mode 100644
index 37d572a86f..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-11:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:b9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.11
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:6e
-      ip: 172.17.99.11
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ba
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:ee:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:ee:f3
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.11
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:df:ac
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:df:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651L5
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
deleted file mode 100644
index 7dfe6836d6..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-12:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:61
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a261
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.12
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:62
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:f7:09:43
-      ip: 172.17.99.12
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:4e:c8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:4e:c9
-      ip6: fe80::7ae7:d1ff:fef9:4ec9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.12
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:4e:d2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:4e:d3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651MC
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
deleted file mode 100644
index b2280449b4..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-13:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:f269
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.13
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:6a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:a1
-      ip: 172.17.99.13
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:7e:f0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:7e:f1
-      ip6: fe80::7ae7:d1ff:fef9:7ef1
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.13
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:7e:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:7e:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651MP
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
deleted file mode 100644
index eee48ac2b5..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-14:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:65
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7365
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:66
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:58:33:67
-      ip: 172.17.99.14
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:5d:0c:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:5d:0c:3f
-      ip6: fe80::7ae7:d1ff:fe5d:c3f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.14
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:5d:0c:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:5d:0c:19
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651JY
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
deleted file mode 100644
index 6fc607abf0..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-15:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:75
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7275
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.15
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:76
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:99:f6
-      ip: 172.17.99.15
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:4f:04
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:4f:05
-      ip6: fe80::7ae7:d1ff:fef5:4f05
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.15
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:0f:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:0f:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651LD
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
deleted file mode 100644
index 99375cae18..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-16:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:51
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d351
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.16
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:f7:09:78
-      ip: 172.17.99.16
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:52
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:03:78
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:03:79
-      ip6: fe80::7ae7:d1ff:fefa:379
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.16
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:fa:03:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:fa:03:5b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651P6
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
deleted file mode 100644
index 6e6c9955f2..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-17:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:31
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7331
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.17
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:32
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:c9:1b
-      ip: 172.17.99.17
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:33
-      ip6: fe80::7ae7:d1ff:fef9:8e33
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.17
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:47
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB803651JT
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
deleted file mode 100644
index ae8b3ef98b..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-18:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:d9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.18
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:58:23:db
-      ip: 172.17.99.18
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:48
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:49
-      ip6: fe80::dad3:85ff:fee6:a549
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.18
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:a5:74
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:a5:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651KF
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
deleted file mode 100644
index cf27f38653..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-19:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d31d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.19
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 1c:c1:de:7b:36:2e
-      ip: 172.17.99.19
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d4:85:64:45:b5:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:37
-      ip6: fe80::d685:64ff:fe45:b537
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.19
-    eth2:
-      mounted: false
-      mac: d4:85:64:45:a5:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:45:a5:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651JB
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
deleted file mode 100644
index 7fc209860a..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-2:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:c9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93c9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.2
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ca
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:58:23:dd
-      ip: 172.17.99.2
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:a3
-      ip6: fe80::dad3:85ff:fee6:a5a3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.2
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:a5:c4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:a5:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651JH
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
deleted file mode 100644
index 9320595261..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-20:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:19
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.20
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:27
-      ip: 172.17.99.20
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:fe:98
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:fe:99
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.20
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:ef:42
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:ef:43
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651J7
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
deleted file mode 100644
index 0d383e2c9f..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-21:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:35
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d335
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.21
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:3a
-      ip: 172.17.99.21
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:36
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:de:b4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:de:b5
-      ip6: fe80::7ae7:d1ff:fef5:deb5
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.21
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:df:80
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:df:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651PW
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
deleted file mode 100644
index dcfac49581..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-22:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fd
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a2fd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.22
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:ac:4d
-      ip: 172.17.99.22
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d4:85:64:43:5b:8c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:43:5b:8d
-      ip6: fe80::d685:64ff:fe43:5b8d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.22
-    eth2:
-      mounted: false
-      mac: d4:85:64:43:5b:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d4:85:64:43:5b:8b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651NB
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
deleted file mode 100644
index 6cfb8aa09a..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-23:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:55
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d355
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:56
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:f7:09:69
-      ip: 172.17.99.23
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:03:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:03:fb
-      ip6: fe80::7ae7:d1ff:fefa:3fb
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.23
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:fa:13:4a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:fa:13:4b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651P2
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
deleted file mode 100644
index 567c8d6353..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-24:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:45
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.24
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:f7:09:84
-      ip: 172.17.99.24
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:46
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:03:44
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:03:45
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.24
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:fa:03:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:fa:03:19
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651N6
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
deleted file mode 100644
index e93477334b..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-25:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:3f
-      rate: 20000000000
-      ip6: fe80::202:c903:6:243f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.25
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:4a
-      ip: 172.17.99.25
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:40
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:5e:28
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:5e:29
-      ip6: fe80::7ae7:d1ff:fef9:5e29
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.25
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:5e:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:5e:33
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651MV
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
deleted file mode 100644
index 94d14d1d30..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-26:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b21d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.26
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:99:ff
-      ip: 172.17.99.26
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:0f:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:0f:c7
-      ip6: fe80::7ae7:d1ff:fef5:fc7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.26
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f6:a0:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f6:a0:4f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651LW
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
deleted file mode 100644
index d9df4229d4..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-27:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:15
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b215
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.27
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:16
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:c9:48
-      ip: 172.17.99.27
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:3e:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:3e:e3
-      ip6: fe80::7ae7:d1ff:fef9:3ee3
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.27
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:4e:b0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:4e:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651M1
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
deleted file mode 100644
index 94703d5d21..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-28:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e5
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:f2e5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.28
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:c9:2d
-      ip: 172.17.99.28
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:53
-      ip6: fe80::7ae7:d1ff:fef9:8e53
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.28
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:4c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651JD
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
deleted file mode 100644
index 540e3a8e71..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-29:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e1
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.29
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:58:33:77
-      ip: 172.17.99.29
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:d5:80
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:d5:81
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.29
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:c5:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:c5:c7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651K4
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
deleted file mode 100644
index 8e5687fb8e..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-3:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:a9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93a9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:aa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:c9:2a
-      ip: 172.17.99.3
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:13:30
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:13:31
-      ip6: fe80::7ae7:d1ff:fefa:1331
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.3
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:fa:13:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:fa:13:27
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651K8
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
deleted file mode 100644
index 28a83734d0..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-30:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fb
-      rate: 20000000000
-      ip6: fe80::202:c903:6:23fb
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.30
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fc
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:cf
-      ip: 172.17.99.30
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:04
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:05
-      ip6: fe80::7ae7:d1ff:fef9:8e05
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.30
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:7e:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:7e:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651N2
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
deleted file mode 100644
index 40d3d0142e..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-31:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:35
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:8235
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.31
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:b9:4e
-      ip: 172.17.99.31
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:36
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:be:38
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:be:39
-      ip6: fe80::7ae7:d1ff:fef9:be39
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.31
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:be:3a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:be:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651LJ
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
deleted file mode 100644
index 83148d04dc..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-32:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:59
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7359
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.32
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:58:23:fc
-      ip: 172.17.99.32
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:6c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:6d
-      ip6: fe80::dad3:85ff:fee6:a56d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.32
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:a5:4c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:a5:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651L9
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
deleted file mode 100644
index cda897a6d1..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-33:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d5
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:c3d5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.33
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:7a
-      ip: 172.17.99.33
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:6f:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:6f:53
-      ip6: fe80::7ae7:d1ff:fef9:6f53
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.33
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:6f:54
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:6f:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651P9
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
deleted file mode 100644
index 10b52dee3a..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-34:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a29d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.34
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:b9:36
-      ip: 172.17.99.34
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:ae:80
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:ae:81
-      ip6: fe80::7ae7:d1ff:fef9:ae81
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.34
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:ae:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:ae:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB803651NV
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
deleted file mode 100644
index 154ec2e790..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-35:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:19
-      rate: 20000000000
-      ip6: fe80::202:c903:7:5019
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.35
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:50:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:72
-      ip: 172.17.99.35
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:ae:20
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:ae:21
-      ip6: fe80::7ae7:d1ff:fef9:ae21
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.35
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:ae:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:ae:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651PH
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
deleted file mode 100644
index c5acac3fee..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-36:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:59
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a259
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.36
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:fb
-      ip: 172.17.99.36
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:73
-      ip6: fe80::7ae7:d1ff:fef9:8e73
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.36
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:a0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651NR
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
deleted file mode 100644
index e6426f7f4b..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-37:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:41
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d341
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.37
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:f7:09:42
-      ip: 172.17.99.37
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:42
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:3e:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:3e:f9
-      ip6: fe80::7ae7:d1ff:fef9:3ef9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.37
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:3e:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:3e:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB803651P3
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
deleted file mode 100644
index f3d812af37..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-38:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:21
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:8221
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.38
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:0f
-      ip: 172.17.99.38
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:22
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:3f:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:3f:5b
-      ip6: fe80::7ae7:d1ff:fef5:3f5b
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.38
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:fe:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:fe:ef
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651M7
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
deleted file mode 100644
index 455d56d8a3..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-39:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:29
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d329
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.39
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:2a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:65
-      ip: 172.17.99.39
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:ae:40
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:ae:41
-      ip6: fe80::7ae7:d1ff:fef9:ae41
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.39
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:ae:44
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:ae:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: GB803651NW
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
deleted file mode 100644
index 4d438a0458..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-4:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:49
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b249
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.4
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:c9:4f
-      ip: 172.17.99.4
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:5e:34
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:5e:35
-      ip6: fe80::7ae7:d1ff:fef9:5e35
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.4
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:5e:58
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:5e:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651NH
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
deleted file mode 100644
index 972bb5f2bd..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-40:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:1f
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.40
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:58:33:0b
-      ip: 172.17.99.40
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:20
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:e3
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.40
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:a5:ec
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:a5:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651KS
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
deleted file mode 100644
index d96616951c..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-5:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:49
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d349
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.5
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:58:33:1d
-      ip: 172.17.99.5
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:5d:2c:44
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:5d:2c:45
-      ip6: fe80::7ae7:d1ff:fe5d:2c45
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.5
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:5d:2c:34
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:5d:2c:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651PN
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
deleted file mode 100644
index babd78aaaf..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-6:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:39
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b239
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.6
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:3a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:58:33:50
-      ip: 172.17.99.6
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:95:e8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:95:e9
-      ip6: fe80::dad3:85ff:fee6:95e9
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.6
-    eth2:
-      mounted: false
-      mac: d8:d3:85:e6:95:ec
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: d8:d3:85:e6:95:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651NM
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
deleted file mode 100644
index a8afeee2fb..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-7:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d34d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.7
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:99:eb
-      ip: 172.17.99.7
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:0f:38
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:0f:39
-      ip6: fe80::7ae7:d1ff:fef5:f39
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.7
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f5:ef:88
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f5:ef:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: GB803651J9
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
deleted file mode 100644
index b6ed2f0c57..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-8:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b24d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.8
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:c9:56
-      ip: 172.17.99.8
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:4e:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:4e:d7
-      ip6: fe80::7ae7:d1ff:fef9:4ed7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.8
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:4e:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:4e:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial_number: GB803651MH
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
deleted file mode 100644
index 40587fc82a..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-parapluie-9:
-  bios:
-    version: O37
-    release_date: 09/06/2010
-    vendor: HP
-  network_interfaces:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:21
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d321
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.9
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:22
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:e1
-      ip: 172.17.99.9
-    eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:f6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:f7
-      ip6: fe80::7ae7:d1ff:fef9:8ef7
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.99.9
-    eth2:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:e4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
-      mounted: false
-      mac: 78:e7:d1:f9:8e:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
-  chassis:
-    serial_number: GB803651P0
-    manufacturer: HP
-    product_name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/generators/input/sites/rennes/clusters/parapluie/parapluie.rb b/generators/input/sites/rennes/clusters/parapluie/parapluie.rb
deleted file mode 100644
index 3933685d82..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/parapluie.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-site :rennes do |site_uid|
-
-  cluster :parapluie do |cluster_uid|
-    model "HP ProLiant DL165 G7"
-    created_at Time.parse("2010-11-02").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    40.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :core_flops => 4932000000,
-        :node_flops => 121200000000
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "ahci",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :device           => "eth0",
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip6'),
-          :switch           => net_switch_lookup('rennes', 'parapluie', node_uid),
-          :switch_port      => net_port_lookup('rennes', 'parapluie', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :device           => "eth2",
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :device           => "eth3",
-          :bridged          => false,
-          :vendor           => "Intel",
-          :version          => "82576",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
-          :device           => "ib0",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT25418",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
-          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :ip6               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
-          :device           => "ib1",
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
-          :vendor           => 'Mellanox',
-          :version          => "MT25418",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
-          :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
-        },
-        {
-          :interface            => 'Ethernet',
-          :rate                 => 1.G,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        monitoring({
-          :temperature  => true,
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :pdu      => [{
-                :uid  => lookup('parapluie_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('parapluie_manual', node_uid, 'pdu', 'pdu_position'),
-             }],
-              :api      => { :metric => "power" }
-            }
-          },
-          :temperature => {
-            :available => true,
-            :via => {
-              :api      => { :metric => "ambient_temp" },
-              :ipmi     => { :sensors => { :ambient => "Inlet Ambient" } }
-            }
-          }
-        })
-
-#        chassis({:serial_number => lookup(node_uid, node_uid, 'chassis', 'serial_number')})
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/rennes/clusters/parapluie/parapluie_manual.yaml b/generators/input/sites/rennes/clusters/parapluie/parapluie_manual.yaml
deleted file mode 100644
index d1b52232d4..0000000000
--- a/generators/input/sites/rennes/clusters/parapluie/parapluie_manual.yaml
+++ /dev/null
@@ -1,321 +0,0 @@
----
-parapluie-1:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi3/42
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 24
-parapluie-2:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/32
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 23
-parapluie-3:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/34
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 22
-parapluie-4:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi3/45
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 21
-parapluie-5:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/29
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 20
-parapluie-6:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/36
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 5
-parapluie-7:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi3/44
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 4
-parapluie-8:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/33
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 3
-parapluie-9:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/35
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 2
-parapluie-10:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/31
-  pdu:
-    pdu_name: parapluie-pdu-1
-    pdu_position: 1
-parapluie-11:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/40
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 24
-parapluie-12:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/41
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 23
-parapluie-13:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/37
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 22
-parapluie-14:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/38
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 21
-parapluie-15:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/39
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 20
-parapluie-16:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/44
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 5
-parapluie-17:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/46
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 4
-parapluie-18:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/45
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 3
-parapluie-19:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/42
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 2
-parapluie-20:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/43
-  pdu:
-    pdu_name: parapluie-pdu-2
-    pdu_position: 1
-parapluie-21:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi3/47
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 24
-parapluie-22:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi3/48
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 23
-parapluie-23:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi3/46
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 22
-parapluie-24:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/48
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 21
-parapluie-25:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi2/47
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 20
-parapluie-26:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/46
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 5
-parapluie-27:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/32
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 4
-parapluie-28:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/31
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 3
-parapluie-29:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/48
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 2
-parapluie-30:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/42
-  pdu:
-    pdu_name: parapluie-pdu-3
-    pdu_position: 1
-parapluie-31:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/41
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 24
-parapluie-32:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/40
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 23
-parapluie-33:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi6/33
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 22
-parapluie-34:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/39
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 21
-parapluie-35:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/33
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 20
-parapluie-36:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/35
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 5
-parapluie-37:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/38
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 4
-parapluie-38:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/34
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 3
-parapluie-39:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/36
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 2
-parapluie-40:
-  network_interfaces:
-    eth1:
-      switch_name: gw-rennes
-      switch_port: Gi4/37
-  pdu:
-    pdu_name: parapluie-pdu-4
-    pdu_position: 1
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
deleted file mode 100644
index c330b390ce..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-1:
-  chassis:
-    serial_number: 1GZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f9:dd
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f9:dc
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f9:da
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.1
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f9:d8
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
deleted file mode 100644
index 1930d48a5d..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-10:
-  chassis:
-    serial_number: 1FZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f7:4a
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f7:4d
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f7:4c
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.10
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f7:48
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
deleted file mode 100644
index 2b06b4c3f9..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-11:
-  chassis:
-    serial_number: 7GZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f7:12
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f7:15
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.11
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f7:10
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f7:14
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
deleted file mode 100644
index eb59d1e03c..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-12:
-  chassis:
-    serial_number: 4GZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f1:4a
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.12
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f1:48
-      mounted: true
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f1:4d
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f1:4c
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
deleted file mode 100644
index 923a3f804b..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-13:
-  chassis:
-    serial_number: 5LZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f5:fa
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f5:fd
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.13
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f5:f8
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f5:fc
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
deleted file mode 100644
index 5f6d269ffe..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-14:
-  chassis:
-    serial_number: 8ZQGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:05:92
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:05:95
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:05:94
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.14
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:05:90
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
deleted file mode 100644
index cc963013e9..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-15:
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:25:95
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:25:94
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:25:92
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.15
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:25:90
-      mounted: true
-  chassis:
-    serial_number: 9JZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
deleted file mode 100644
index 60eae78fe1..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-16:
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.16
-      driver: ixgbe
-      mac: ec:f4:bb:d6:10:38
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: ec:f4:bb:d6:10:3a
-      rate: 10000000000
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d6:10:3c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d6:10:3d
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  processor:
-    clock_speed: 2400000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial_number: 2XG6152
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  block_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AE
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
deleted file mode 100644
index aca0fbfe09..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-17:
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:01:bd
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:01:bc
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:01:ba
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.17
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:01:b8
-      mounted: true
-  chassis:
-    serial_number: 3JZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
deleted file mode 100644
index 47c4c17828..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-18:
-  chassis:
-    serial_number: FZQGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:11:cd
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:11:cc
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:11:ca
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.18
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:11:c8
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
deleted file mode 100644
index abf49f908a..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-19:
-  chassis:
-    serial_number: C0RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:24:8a
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.19
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:24:88
-      mounted: true
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:24:8d
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:24:8c
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
deleted file mode 100644
index 4c6fefd69a..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-2:
-  chassis:
-    serial_number: BGZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f8:55
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f8:54
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f8:52
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.2
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f8:50
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
deleted file mode 100644
index 70f77d524a..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-20:
-  chassis:
-    serial_number: 31RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fd:35
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fd:34
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fd:32
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.20
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fd:30
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
deleted file mode 100644
index 9ab659633a..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-21:
-  chassis:
-    serial_number: 7HZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:ff:fa
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:ff:fd
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.21
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:ff:f8
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:ff:fc
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
deleted file mode 100644
index ab4b1ee5ba..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-22:
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:00:62
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:65
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.22
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:00:60
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:64
-      mounted: false
-  chassis:
-    serial_number: 4KZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
deleted file mode 100644
index 189ae94fbb..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-23:
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:0e:62
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:0e:65
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:0e:64
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.23
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:0e:60
-      mounted: true
-  chassis:
-    serial_number: 20RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
deleted file mode 100644
index daf9d2ca96..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-24:
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:10:1a
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:10:1d
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.24
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:10:18
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:10:1c
-      mounted: false
-  chassis:
-    serial_number: 50RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
deleted file mode 100644
index 04e3b9ed08..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-25:
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:0d:da
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:0d:dd
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:0d:dc
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.25
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:0d:d8
-      mounted: true
-  chassis:
-    serial_number: 70RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
deleted file mode 100644
index ce95940a0f..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-26:
-  chassis:
-    serial_number: 90RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:26:0a
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:26:0d
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:26:0c
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.26
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:26:08
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
deleted file mode 100644
index 5984d6f202..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-27:
-  chassis:
-    serial_number: H0RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fb:ea
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fb:ed
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fb:ec
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.27
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fb:e8
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
deleted file mode 100644
index 646221d700..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-28:
-  chassis:
-    serial_number: 30RGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:04:3a
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.28
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:04:38
-      mounted: true
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:04:3d
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:04:3c
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
deleted file mode 100644
index 861aa2fa1d..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-3:
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f3:1a
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f3:1d
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.3
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f3:18
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f3:1c
-      mounted: false
-  chassis:
-    serial_number: 8FZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
deleted file mode 100644
index 138d589011..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-4:
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:02:8a
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:02:8d
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.4
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:02:88
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:02:8c
-      mounted: false
-  chassis:
-    serial_number: HHZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
deleted file mode 100644
index 8c232dbe9e..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-5:
-  chassis:
-    serial_number: CKZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:02:62
-      mounted: false
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:02:65
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.5
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:02:60
-      mounted: true
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:02:64
-      mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
deleted file mode 100644
index bfb6a7609a..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-6:
-  chassis:
-    serial_number: HKZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:75
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:74
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:00:72
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.6
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:00:70
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
deleted file mode 100644
index 9e4f25f448..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-7:
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fc:3d
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fc:3a
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fc:3c
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.7
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fc:38
-      mounted: true
-  chassis:
-    serial_number: 3FZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
deleted file mode 100644
index 320b46ebb7..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-8:
-  chassis:
-    serial_number: GFZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f2:4d
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f2:4c
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f2:4a
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.8
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f2:48
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
deleted file mode 100644
index bd47739ccc..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-parasilo-9:
-  network_interfaces:
-    eth3:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f0:bd
-      mounted: false
-    eth2:
-      interface: Ethernet
-      management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f0:bc
-      mounted: false
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f0:ba
-      mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.9
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f0:b8
-      mounted: true
-  chassis:
-    serial_number: DDZGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  block_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdc:
-      device: sdc
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-    sda:
-      device: sda
-      rev: LS0A
-      model: ST600MM0006
-      size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
diff --git a/generators/input/sites/rennes/clusters/parasilo/parasilo.rb b/generators/input/sites/rennes/clusters/parasilo/parasilo.rb
deleted file mode 100644
index 4b65e2c378..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/parasilo.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-site :rennes do |site_uid|
-
-  cluster :parasilo do |cluster_uid|
-    model "Dell PowerEdge R630"
-    created_at Time.parse("2015-01-13").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    28.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-         :core_flops => 18720000000,
-         :node_flops => 252800000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdc',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdc', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdd',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdd',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdd',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdd', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sde',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sde',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sde',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sde', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdf',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdf',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdf',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdf', 'rev'),
-          :storage   => 'SSD'
-        }
-        ]
-
-        network_adapters [        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :rate             => 10.G,
-          :device           => "eth0",
-          :enabled          => true,
-          :management       => false,
-          :mountable        => true,
-          :mounted          => true,
-          :bridged          => true,
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch_port      => net_port_lookup('rennes', 'parasilo', node_uid, 'eth0'),
-          :switch           => net_switch_lookup('rennes', 'parasilo', node_uid, 'eth0')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => true,
-          :management       => false,
-          :mountable        => true,
-          :mounted          => false,
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch_port      => net_port_lookup('rennes', 'parasilo', node_uid, 'eth1'),
-          :switch           => net_switch_lookup('rennes', 'parasilo', node_uid, 'eth1')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false,
-          :management       => false,
-          :mountable        => false,
-          :mounted          => false,
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false,
-          :management       => false,
-          :mountable        => false,
-          :mounted          => false,
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :rate                 => 100.M,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :pdu      => [{
-                :uid  => lookup('parasilo_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('parasilo_manual', node_uid, 'pdu', 'pdu_position'),
-             }],
-              :api      => { :metric => "power" }
-            }
-          }
-        })
-
-      end # node
-
-    end #
-
-  end # cluster
-
-end # site
diff --git a/generators/input/sites/rennes/clusters/parasilo/parasilo_manual.yaml b/generators/input/sites/rennes/clusters/parasilo/parasilo_manual.yaml
deleted file mode 100644
index 5a0b579cfc..0000000000
--- a/generators/input/sites/rennes/clusters/parasilo/parasilo_manual.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-parasilo-1:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 7
-parasilo-2:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 9
-parasilo-3:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 10
-parasilo-4:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 6
-parasilo-5:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 5
-parasilo-6:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 9
-parasilo-7:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 4
-parasilo-8:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 9
-parasilo-9:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 3
-parasilo-10:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 11
-parasilo-11:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 2
-parasilo-12:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 7
-parasilo-13:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 7
-parasilo-14:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 6
-parasilo-15:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 6
-parasilo-16:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 5
-parasilo-17:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 5
-parasilo-18:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 4
-parasilo-19:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 4
-parasilo-20:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 3
-parasilo-21:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 3
-parasilo-22:
-  pdu:
-    pdu_name: parasilo-pdu-3
-    pdu_position: 2
-parasilo-23:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 2
-parasilo-24:
-  pdu:
-    pdu_name: parasilo-pdu-4
-    pdu_position: 1
-parasilo-25:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 17
-parasilo-26:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 22
-parasilo-27:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 18
-parasilo-28:
-  pdu:
-    pdu_name: parasilo-pdu-2
-    pdu_position: 21
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
deleted file mode 100644
index 020ad887db..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-paravance-1:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 42RGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    bmc:
-      mac: b8:2a:72:fc:f6:22
-      ip: 172.17.96.1
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:22
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:25
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fb:20
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.1
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:24
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
deleted file mode 100644
index c7e1d1889b..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-10:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 79WGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:b2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:b5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fa:b0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.10
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:b4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
deleted file mode 100644
index 98e0ce6f02..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-11:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: HTQGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:4a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:4d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fa:48
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.11
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:4c
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
deleted file mode 100644
index 7957e69a19..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-12:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3TZGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:25
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:24
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:22
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:20
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.12
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
deleted file mode 100644
index 9ab8e89d1e..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-13:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: F3RGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:62
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:65
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f7:60
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.13
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:64
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
deleted file mode 100644
index d14e05bd1e..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-14:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: GSZGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:5a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:5d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:58
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.14
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:5c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
deleted file mode 100644
index 7376743449..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-15:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 63RGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:92
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:95
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:90
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.15
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:94
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
deleted file mode 100644
index 241855537f..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-16:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 2HXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:3a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:3d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:38
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.16
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:3c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
deleted file mode 100644
index 29070a32e7..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-17:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3MXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:c2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:c5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:c0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.17
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:c4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
deleted file mode 100644
index e9fefe6640..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-18:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 10VGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:ea
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:e8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.18
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:ed
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:ec
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
deleted file mode 100644
index 865c8c3971..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-19:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: CFXGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:9a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:9d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:9c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:98
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.19
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
deleted file mode 100644
index 6c9df2aece..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-2:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 6XQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:b6:c5
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:b6:c2
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:b6:c0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.2
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:b6:c4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
deleted file mode 100644
index 72970f12d6..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-20:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 4VXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:02
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:05
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:00
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.20
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:04
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
deleted file mode 100644
index d24f4c137f..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-21:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3NXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:d1:0a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:d1:0d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:cf:d1:08
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.21
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:d1:0c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
deleted file mode 100644
index d9d40d83e2..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-22:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 81RGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:1d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:1c
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:1a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:04:18
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.22
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
deleted file mode 100644
index 1eb1c7fc6b..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-23:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 1XQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:25
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:24
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:22
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:20
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.23
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
deleted file mode 100644
index 51368bf3ba..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-24:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: CVQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:ed
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:ea
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:ec
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f6:e8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.24
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
deleted file mode 100644
index e29f8749df..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-25:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: BFWGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:1a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:18
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.25
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:1d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:1c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
deleted file mode 100644
index 03d79c1ba5..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-26:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: D9WGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:06:e2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:06:e5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:06:e0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.26
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:06:e4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
deleted file mode 100644
index 171f88b64d..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-27:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 2FWGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:0d
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:0a
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:0c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f0:08
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.27
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
deleted file mode 100644
index 1a74a6cffb..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-28:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: BQQGG42
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f9:0d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f9:0c
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f9:0a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f9:08
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.28
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
deleted file mode 100644
index 20402a1f2b..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-29:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: J9WGG42
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:85
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:84
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:82
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:80
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.29
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
deleted file mode 100644
index fbec301e6c..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-3:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: G1RGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:cd
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:cc
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:ca
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f0:c8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.3
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
deleted file mode 100644
index 5684a3db87..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-30:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: C7VGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:8a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:8d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f5:88
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.30
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:8c
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
deleted file mode 100644
index 13cb33a968..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-31:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 14RGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:9a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:9d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:9c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f8:98
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.31
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
deleted file mode 100644
index 99de2c723a..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-32:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 5QXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:f5
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:f2
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:f4
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:f0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.32
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
deleted file mode 100644
index 2f98ae9570..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-33:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3DWGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:4a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:4d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:04:48
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.33
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:4c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
deleted file mode 100644
index 5c38e805c0..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-34:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: BRQGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:0a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:0d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:0c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f5:08
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.34
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
deleted file mode 100644
index 94f8ba1362..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-35:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: G8WGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:c2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:c5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f7:c0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.35
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:c4
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
deleted file mode 100644
index 02a74697a5..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-36:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: FBWGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:22
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:20
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.36
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:25
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:24
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
deleted file mode 100644
index 1541eba9bd..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-37:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 23RGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:da
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:dd
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f0:d8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.37
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:dc
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
deleted file mode 100644
index de86ffab5c..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-38:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3XQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fd:e2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fd:e5
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fd:e4
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fd:e0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.38
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
deleted file mode 100644
index 4253ec2a0b..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-39:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: B3VGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:dd
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:dc
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:da
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:d8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.39
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
deleted file mode 100644
index b8312975be..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-4:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: DWQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:45
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:44
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:42
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:40
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.4
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
deleted file mode 100644
index 91f9213744..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-40:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 92RGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:22
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:25
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f8:20
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.40
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:24
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
deleted file mode 100644
index 39f3058466..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-41:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 8PQGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:fd
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:fc
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:fa
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f0:f8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.41
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
deleted file mode 100644
index 0b5ecb5eb9..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-42:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 64RGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:d2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:d5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:d0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.42
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:d4
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
deleted file mode 100644
index 8961223439..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-43:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3SQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:3a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:3d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fa:38
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.43
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:3c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
deleted file mode 100644
index 1f1ea466be..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-44:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 9NXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:eb:52
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:eb:55
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:eb:54
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:eb:50
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.44
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
deleted file mode 100644
index 940defed55..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-45:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 9XQGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ee:22
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ee:25
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ee:20
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.45
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ee:24
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
deleted file mode 100644
index 0fd9dbbc8f..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-46:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: BVQGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:ce:a5:62
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:ce:a5:60
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.46
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:ce:a5:65
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:ce:a5:64
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
deleted file mode 100644
index 9c8ab252b6..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-47:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: DDXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:9a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:9d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:98
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.47
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:9c
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
deleted file mode 100644
index 5bbac5ccbe..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-48:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: GWQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:4d
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:4a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fb:48
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.48
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:4c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
deleted file mode 100644
index a53e586204..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-49:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: FRXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:d2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:d5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:d0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.49
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:d4
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
deleted file mode 100644
index b33906af5f..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-5:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3WQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:6d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:6c
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:6a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:68
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.5
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
deleted file mode 100644
index b2c9f5bf51..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-50:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 9PXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:5d
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:5a
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:5c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:58
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.50
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
deleted file mode 100644
index a4f4d7c668..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-51:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 8JXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:7a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:78
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.51
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d1:01:7c
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d1:01:7d
-      mounted: false
-      management: false
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
deleted file mode 100644
index 5fb631724a..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-52:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: DSQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:d2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:d5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:d0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.52
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:d4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
deleted file mode 100644
index 9a14cef497..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-53:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 4FXGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:92
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:95
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:94
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:90
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.53
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
deleted file mode 100644
index 350e143904..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-54:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 1RQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:5a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:5d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f7:58
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.54
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:5c
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
deleted file mode 100644
index e40e43f22e..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-55:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 5BWGG42
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:35
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:34
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:32
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f6:30
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.55
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
deleted file mode 100644
index d010990383..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-56:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 7KXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ed
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ec
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ea
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:e8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.56
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
deleted file mode 100644
index d9c64adedf..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-57:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 92VGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:aa
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ad
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:a8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.57
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ac
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
deleted file mode 100644
index ef67d0bfcf..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-58:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 1WQGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:7d
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:7a
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:7c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f7:78
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.58
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
deleted file mode 100644
index c45ac7dd17..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-59:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 58VGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:03:7a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:03:7d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:03:7c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:03:78
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.59
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
deleted file mode 100644
index 2ac979950e..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-6:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: B4RGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:75
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:72
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:74
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f8:70
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.6
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
deleted file mode 100644
index 26d6de2ae6..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-60:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 33VGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:85
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:84
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:82
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:80
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.60
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
deleted file mode 100644
index 70fbeb9a33..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-61:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 2SXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:2d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:2c
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:2a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:28
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.61
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
deleted file mode 100644
index 3e8ebedefa..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-62:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 7LXGG42
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:0d
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:0a
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:08
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.62
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:0c
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
deleted file mode 100644
index 5582a35a8b..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-63:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 8SXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:cb:f2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:cb:f5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:cb:f0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.63
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:cb:f4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
deleted file mode 100644
index 97211e5660..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-64:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 26VGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:2a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:2d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:28
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.64
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:2c
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
deleted file mode 100644
index 1d8085845e..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-65:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 4PXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:12
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:15
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:10
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.65
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:14
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
deleted file mode 100644
index 03f16f7d57..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-66:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 2GWGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:74:dd
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:74:da
-      interface: Ethernet
-      rate: 10000000000
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:74:dc
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:cf:74:d8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.66
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
deleted file mode 100644
index bc98e912a8..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-67:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 3GXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:f2
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:f0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.67
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:f5
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:f4
-      interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
deleted file mode 100644
index 31f86990c6..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-68:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 8HXGG42
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:ea
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:ed
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:e8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.68
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:ec
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
deleted file mode 100644
index 0c51177943..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-69:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 47VGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:12
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:15
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:14
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:10
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.69
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
deleted file mode 100644
index 8fd7e07c3d..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-7:
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d0:f4:0c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.96.7
-      driver: ixgbe
-      mac: ec:f4:bb:d0:f4:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d0:f4:0d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: ec:f4:bb:d0:f4:0a
-      rate: 10000000000
-      mounted: false
-      management: false
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  block_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 6SQGG42
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R630
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2400000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
deleted file mode 100644
index 49a3ba66d2..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-70:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 86VGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:b2
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:b5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:b0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.70
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:b4
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
deleted file mode 100644
index 47b6c88943..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-71:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: F0VGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:e5
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:e4
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:e2
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:e0
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.71
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
deleted file mode 100644
index eacdfb0562..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-72:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: 2JXGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:dd
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:dc
-      interface: Ethernet
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:da
-      interface: Ethernet
-      rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:d8
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.72
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
deleted file mode 100644
index beb7d6cc05..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-8:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: JXQGG42
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:82
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:85
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:80
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.8
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:84
-      interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
diff --git a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/generators/input/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
deleted file mode 100644
index daec1b9453..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-paravance-9:
-  block_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  architecture:
-    platform_type: x86_64
-    smt_size: 16
-    smp_size: 2
-  chassis:
-    product_name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial_number: HSQGG42
-  main_memory:
-    ram_size: 137438953472
-  network_interfaces:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f2:2a
-      interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f2:2d
-      interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f2:2c
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f2:28
-      interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.9
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
-  processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1d: 32768
-    cache_l1i: 32768
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/generators/input/sites/rennes/clusters/paravance/paravance.rb b/generators/input/sites/rennes/clusters/paravance/paravance.rb
deleted file mode 100644
index af58579906..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/paravance.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-site :rennes do |site_uid|
-
-  cluster :paravance do |cluster_uid|
-    model "Dell PowerEdge R630"
-    created_at Time.parse("2015-01-13").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    72.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-         :core_flops => 14600000000,
-         :node_flops => 245300000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sda',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage   => 'HDD'
-        },
-        {
-          :interface => 'SATA',
-          :driver    => "ahci",
-          :device    => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'device'),
-          :size      => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'size'),
-          :model     => lookup(node_uid, node_uid, 'block_devices' ,'sdb',  'model'),
-          :rev       => lookup(node_uid, node_uid, 'block_devices', 'sdb', 'rev'),
-          :storage   => 'HDD'
-        }]
-
-        network_adapters [        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :rate             => 10.G,
-          :device           => "eth0",
-          :enabled          => true,
-          :management       => false,
-          :mountable        => true,
-          :mounted          => true,
-          :bridged          => true,
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :switch_port      => net_port_lookup('rennes', 'paravance', node_uid, 'eth0'),
-          :switch           => net_switch_lookup('rennes', 'paravance', node_uid, 'eth0')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 10.G,
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'rate'),
-          :enabled          => true,
-          :management       => false,
-          :mountable        => true,
-          :mounted          => false,
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "Intel",
-          :version          => '82599EB 10-Gigabit SFI/SFP+ Network Connection',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac'),
-          :switch_port      => net_port_lookup('rennes', 'paravance', node_uid, 'eth1'),
-          :switch           => net_switch_lookup('rennes', 'paravance', node_uid, 'eth1')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false,
-          :management       => false,
-          :mountable        => false,
-          :mounted          => false,
-          :bridged          => false,
-          :device           => "eth2",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mac'),
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'interface'),
-          :rate             => 1.G,
-          :enabled          => false,
-          :management       => false,
-          :mountable        => false,
-          :mounted          => false,
-          :bridged          => false,
-          :device           => "eth3",
-          :vendor           => "Intel",
-          :version          => "Intel Corporation",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'driver'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mac')
-        },
-        {
-          :interface            => 'Ethernet',
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :rate                 => 100.M,
-          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :enabled              => true,
-          :mounted              => false,
-          :mountable            => false,
-          :management           => true,
-          :device               => "bmc",
-        }]
-
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu => false
-        })
-
-        sensors({
-          :power => {
-            :available => true,
-            :via => {
-              :pdu      => [{
-                :uid  => lookup('paravance_manual', node_uid, 'pdu', 'pdu_name'),
-                :port => lookup('paravance_manual', node_uid, 'pdu', 'pdu_position'),
-             }],
-              :api      => { :metric => "power" }
-            }
-          }
-        })
-
-      end # node
-
-    end #
-
-  end # cluster
-
-end # site
diff --git a/generators/input/sites/rennes/clusters/paravance/paravance_manual.yaml b/generators/input/sites/rennes/clusters/paravance/paravance_manual.yaml
deleted file mode 100644
index a3a0b184f4..0000000000
--- a/generators/input/sites/rennes/clusters/paravance/paravance_manual.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
----
-paravance-1:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 6
-paravance-2:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 5
-paravance-3:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 5
-paravance-4:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 4
-paravance-5:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 4
-paravance-6:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 3
-paravance-7:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 10
-paravance-8:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 10
-paravance-9:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 9
-paravance-10:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 9
-paravance-11:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 7
-paravance-12:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 7
-paravance-13:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 6
-paravance-14:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 6
-paravance-15:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 5
-paravance-16:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 5
-paravance-17:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 4
-paravance-18:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 4
-paravance-19:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 3
-paravance-20:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 3
-paravance-21:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 2
-paravance-22:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 2
-paravance-23:
-  pdu:
-    pdu_name: paravance-pdu-3
-    pdu_position: 1
-paravance-24:
-  pdu:
-    pdu_name: paravance-pdu-4
-    pdu_position: 1
-paravance-25:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 22
-paravance-26:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 21
-paravance-27:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 18
-paravance-28:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 17
-paravance-29:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 17
-paravance-30:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 15
-paravance-31:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 13
-paravance-32:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 13
-paravance-33:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 11
-paravance-34:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 11
-paravance-35:
-  pdu:
-    pdu_name: paravance-pdu-2
-    pdu_position: 10
-paravance-36:
-  pdu:
-    pdu_name: paravance-pdu-1
-    pdu_position: 10
-paravance-37:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 9
-paravance-38:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 9
-paravance-39:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 10
-paravance-40:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 10
-paravance-41:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 11
-paravance-42:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 3
-paravance-43:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 2
-paravance-44:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 2
-paravance-45:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 1
-paravance-46:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 1
-paravance-47:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 7
-paravance-48:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 7
-paravance-49:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 6
-paravance-50:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 5
-paravance-51:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 5
-paravance-52:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 3
-paravance-53:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 4
-paravance-54:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 3
-paravance-55:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 4
-paravance-56:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 2
-paravance-57:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 2
-paravance-58:
-  pdu:
-    pdu_name: paravance-pdu-7
-    pdu_position: 1
-paravance-59:
-  pdu:
-    pdu_name: paravance-pdu-8
-    pdu_position: 1
-paravance-60:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 21
-paravance-61:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 21
-paravance-62:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 19
-paravance-63:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 19
-paravance-64:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 17
-paravance-65:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 17
-paravance-66:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 15
-paravance-67:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 14
-paravance-68:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 12
-paravance-69:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 10
-paravance-70:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 10
-paravance-71:
-  pdu:
-    pdu_name: paravance-pdu-6
-    pdu_position: 9
-paravance-72:
-  pdu:
-    pdu_name: paravance-pdu-5
-    pdu_position: 9
diff --git a/generators/input/sites/rennes/net-links/bigdata-sw.yaml b/generators/input/sites/rennes/net-links/bigdata-sw.yaml
deleted file mode 100644
index 8561df5f53..0000000000
--- a/generators/input/sites/rennes/net-links/bigdata-sw.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-bigdata-sw:
-  model: Force10 S4810
-  kind: switch
-  site: rennes
-  snmp_community: public
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.111.203
-  routes: {}
-  backplane_bps: 1280000000000
-  mtu: 1500
-  linecards:
-    0:
-      naming_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-      kind: node
-      rate: 10000000000
-      port: eth0
-      ports:
-        0:
-          uid: c6509
-          kind: switch
-          port: "1:3"
-        11:
-          uid: srv-bigdata
-          kind: other
-        18:
-          uid: ceph3
-          kind: other
-        19:
-          uid: ceph2
-          kind: other
-        20: paranoia-8
-        21: paranoia-7
-        22: paranoia-4
-        23: paranoia-3
-        42:
-          uid: ceph1
-          kind: other
-        43:
-          uid: ceph0
-          kind: other
-        44: paranoia-6
-        45: paranoia-5
-        46: paranoia-2
-        47: paranoia-1
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/rennes/net-links/c6509.yaml b/generators/input/sites/rennes/net-links/c6509.yaml
deleted file mode 100644
index 11bd7f05e9..0000000000
--- a/generators/input/sites/rennes/net-links/c6509.yaml
+++ /dev/null
@@ -1,163 +0,0 @@
----
-c6509:
-  model: Cisco WS-C6509-E
-  kind: switch
-  site: rennes
-  snmp_community: privkavlan
-  backplane_bps: 720000000000
-  mtu: 9216
-  linecards:
-    1:
-      kind: virtual
-      naming_pattern: Te%LINECARD%/%PORT%
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      rate: 10000000000
-      backplane_bps: 40000000000
-      model: WS-X6704-10GE
-      ports:
-        2:
-          uid: gw-rennes
-          kind: router
-        3:
-          uid: bigdata-sw
-          kind: switch
-    2:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      model: WS-X6748-GE-TX
-      ports:
-        31: parapluie-10
-        40: parapluie-11
-        41: parapluie-12
-        37: parapluie-13
-        38: parapluie-14
-        39: parapluie-15
-        44: parapluie-16
-        46: parapluie-17
-        45: parapluie-18
-        42: parapluie-19
-        32: parapluie-2
-        43: parapluie-20
-        48: parapluie-24
-        47: parapluie-25
-        34: parapluie-3
-        29: parapluie-5
-        36: parapluie-6
-        33: parapluie-8
-        35: parapluie-9
-        3:
-          uid: paranoia-3
-          port: eth2
-        6:
-          uid: paranoia-7
-          port: eth2
-    3:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      model: WS-X6748-GE-TX
-      ports:
-        42: parapluie-1
-        47: parapluie-21
-        48: parapluie-22
-        46: parapluie-23
-        45: parapluie-4
-        44: parapluie-7
-        3:
-          uid: paranoia-1
-          port: eth2
-        9:
-          uid: paranoia-2
-          port: eth2
-        1:
-          uid: paranoia-4
-          port: eth2
-        7:
-          uid: paranoia-5
-          port: eth2
-        10:
-          uid: paranoia-6
-          port: eth2
-        13:
-          uid: paranoia-8
-          port: eth2
-    8:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      model: WS-X6748-GE-TX
-      ports:
-        16:
-    7:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      model: WS-X6748-GE-TX
-      ports:
-        47: parapide-1
-        43: parapide-10
-        48: parapide-2
-        36: parapide-21
-        37: parapide-23
-        38: parapide-25
-        34: parapide-3
-        46: parapide-4
-        44: parapide-5
-        39: parapide-6
-        40: parapide-7
-        42: parapide-8
-        41: parapide-9
-    6:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      model: WS-X6748-GE-TX
-      ports:
-        45: parapide-11
-        48: parapide-12
-        47: parapide-13
-        44: parapide-14
-        46: parapide-15
-        42: parapide-16
-        41: parapide-17
-        39: parapide-18
-        40: parapide-19
-        43: parapide-20
-        38: parapide-22
-        37: parapide-24
-        33: parapluie-33
-    4:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      rate: 1000000000
-      backplane_bps: 40000000000
-      model: WS-X6748-GE-TX
-      ports:
-        46: parapluie-26
-        32: parapluie-27
-        31: parapluie-28
-        48: parapluie-29
-        42: parapluie-30
-        41: parapluie-31
-        40: parapluie-32
-        39: parapluie-34
-        33: parapluie-35
-        35: parapluie-36
-        38: parapluie-37
-        34: parapluie-38
-        36: parapluie-39
-        37: parapluie-40
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: Port-channel%CHANNELID%
diff --git a/generators/input/sites/rennes/net-links/gw-rennes.yaml b/generators/input/sites/rennes/net-links/gw-rennes.yaml
deleted file mode 100644
index 8290378fa6..0000000000
--- a/generators/input/sites/rennes/net-links/gw-rennes.yaml
+++ /dev/null
@@ -1,337 +0,0 @@
----
-gw-rennes:
-  model: Nexus 56128P
-  kind: router
-  site: rennes
-  snmp_community: public
-  routes: {}
-  backplane_bps: 1440000000000
-  mtu: 1500
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.111.254
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.111.254
-    "vlan500":
-      addresses:
-        - 192.168.4.19
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.24.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.24.64.0/18
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.24.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.24.192.0/18
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.25.0.0/18
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.25.64.0/18
-    "vlan716":
-      name: kavlan-16
-      addresses:
-        - 10.27.192.0/18
-  routes: {}
-  linecards:
-    1:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      ports:
-        1:
-          uid: parasilo-1
-          kind: node
-          port: eth1
-        2:
-          uid: parasilo-1
-          kind: node
-          port: eth0
-        3:
-          uid: parasilo-2
-          kind: node
-          port: eth1
-        4:
-          uid: parasilo-2
-          kind: node
-          port: eth0
-        5:
-          uid: parasilo-3
-          kind: node
-          port: eth1
-        6:
-          uid: parasilo-3
-          kind: node
-          port: eth0
-        7:
-          uid: parasilo-4
-          kind: node
-          port: eth1
-        8:
-          uid: parasilo-4
-          kind: node
-          port: eth0
-        9:
-          uid: parasilo-5
-          kind: node
-          port: eth1
-        10:
-          uid: parasilo-5
-          kind: node
-          port: eth0
-        11:
-          uid: parasilo-6
-          kind: node
-          port: eth1
-        12:
-          uid: parasilo-6
-          kind: node
-          port: eth0
-        13:
-          uid: parasilo-7
-          kind: node
-          port: eth1
-        14:
-          uid: parasilo-7
-          kind: node
-          port: eth0
-        15:
-          uid: parasilo-8
-          kind: node
-          port: eth1
-        16:
-          uid: parasilo-8
-          kind: node
-          port: eth0
-        17:
-          uid: parasilo-9
-          kind: node
-          port: eth1
-        18:
-          uid: parasilo-9
-          kind: node
-          port: eth0
-        19:
-          uid: parasilo-10
-          kind: node
-          port: eth1
-        20:
-          uid: parasilo-10
-          kind: node
-          port: eth0
-        21:
-          uid: parasilo-11
-          kind: node
-          port: eth1
-        22:
-          uid: parasilo-11
-          kind: node
-          port: eth0
-        23:
-          uid: parasilo-12
-          kind: node
-          port: eth1
-        24:
-          uid: parasilo-12
-          kind: node
-          port: eth0
-        25:
-          uid: parasilo-13
-          kind: node
-          port: eth1
-        26:
-          uid: parasilo-13
-          kind: node
-          port: eth0
-        27:
-          uid: parasilo-14
-          kind: node
-          port: eth1
-        28:
-          uid: parasilo-14
-          kind: node
-          port: eth0
-        29:
-          uid: parasilo-15
-          kind: node
-          port: eth1
-        30:
-          uid: parasilo-15
-          kind: node
-          port: eth0
-        31:
-          uid: parasilo-16
-          kind: node
-          port: eth1
-        32:
-          uid: parasilo-16
-          kind: node
-          port: eth0
-        33:
-          uid: parasilo-17
-          kind: node
-          port: eth1
-        34:
-          uid: parasilo-17
-          kind: node
-          port: eth0
-        35:
-          uid: parasilo-18
-          kind: node
-          port: eth1
-        36:
-          uid: parasilo-18
-          kind: node
-          port: eth0
-        37:
-          uid: parasilo-19
-          kind: node
-          port: eth1
-        38:
-          uid: parasilo-19
-          kind: node
-          port: eth0
-        39:
-          uid: parasilo-20
-          kind: node
-          port: eth1
-        40:
-          uid: parasilo-20
-          kind: node
-          port: eth0
-        41:
-          uid: parasilo-21
-          kind: node
-          port: eth1
-        42:
-          uid: parasilo-21
-          kind: node
-          port: eth0
-        43:
-          uid: parasilo-22
-          kind: node
-          port: eth1
-        44:
-          uid: parasilo-22
-          kind: node
-          port: eth0
-        45:
-          uid: parasilo-23
-          kind: node
-          port: eth1
-        46:
-          uid: parasilo-23
-          kind: node
-          port: eth0
-        47:
-          uid: parasilo-24
-          kind: node
-          port: eth1
-        48:
-          uid: parasilo-24
-          kind: node
-          port: eth0
-        49:
-          uid: paravance-sw-2
-          rate: 40000000000
-          kind: switch
-        50:
-          uid: paravance-sw-2
-          rate: 40000000000
-          kind: switch
-        51:
-          uid: paravance-sw-1
-          rate: 40000000000
-          kind: switch
-        52:
-          uid: paravance-sw-1
-          rate: 40000000000
-          kind: switch
-    2:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      ports:
-        1:
-          uid: parasilo-25
-          kind: node
-          port: eth1
-        2:
-          uid: parasilo-25
-          kind: node
-          port: eth0
-        3:
-          uid: parasilo-26
-          kind: node
-          port: eth1
-        4:
-          uid: parasilo-26
-          kind: node
-          port: eth0
-        5:
-          uid: parasilo-27
-          kind: node
-          port: eth1
-        6:
-          uid: parasilo-27
-          kind: node
-          port: eth0
-        7:
-          uid: parasilo-28
-          kind: node
-          port: eth1
-        8:
-          uid: parasilo-28
-          kind: node
-          port: eth0
-        23:
-          uid: c6509
-          kind: router
-        24:
-          uid: renater-rennes
-          kind: virtual
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: port-channel%CHANNELID%
-    2:
-      - linecard: 1
-        port: 51
-        rate: 40000000000
-      - linecard: 1
-        port: 52
-        rate: 40000000000
-    3:
-      - linecard: 1
-        port: 49
-        rate: 40000000000
-      - linecard: 1
-        port: 50
-        rate: 40000000000
diff --git a/generators/input/sites/rennes/net-links/paravance-sw-1.yaml b/generators/input/sites/rennes/net-links/paravance-sw-1.yaml
deleted file mode 100644
index 7d28a74080..0000000000
--- a/generators/input/sites/rennes/net-links/paravance-sw-1.yaml
+++ /dev/null
@@ -1,326 +0,0 @@
----
-paravance-sw-1:
-  model: Nexus 56128P
-  kind: switch
-  site: rennes
-  snmp_community: public
-  routes: {}
-  backplane_bps: 1440000000000
-  mtu: 1500
-  linecards:
-    1:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      ports:
-        1:
-          uid: paravance-1
-          kind: node
-          port: eth1
-        2:
-          uid: paravance-1
-          kind: node
-          port: eth0
-        3:
-          uid: paravance-2
-          kind: node
-          port: eth1
-        4:
-          uid: paravance-2
-          kind: node
-          port: eth0
-        5:
-          uid: paravance-3
-          kind: node
-          port: eth1
-        6:
-          uid: paravance-3
-          kind: node
-          port: eth0
-        7:
-          uid: paravance-4
-          kind: node
-          port: eth1
-        8:
-          uid: paravance-4
-          kind: node
-          port: eth0
-        9:
-          uid: paravance-5
-          kind: node
-          port: eth1
-        10:
-          uid: paravance-5
-          kind: node
-          port: eth0
-        11:
-          uid: paravance-6
-          kind: node
-          port: eth1
-        12:
-          uid: paravance-6
-          kind: node
-          port: eth0
-        13:
-          uid: paravance-7
-          kind: node
-          port: eth1
-        14:
-          uid: paravance-7
-          kind: node
-          port: eth0
-        15:
-          uid: paravance-8
-          kind: node
-          port: eth1
-        16:
-          uid: paravance-8
-          kind: node
-          port: eth0
-        17:
-          uid: paravance-9
-          kind: node
-          port: eth1
-        18:
-          uid: paravance-9
-          kind: node
-          port: eth0
-        19:
-          uid: paravance-10
-          kind: node
-          port: eth1
-        20:
-          uid: paravance-10
-          kind: node
-          port: eth0
-        21:
-          uid: paravance-11
-          kind: node
-          port: eth1
-        22:
-          uid: paravance-11
-          kind: node
-          port: eth0
-        23:
-          uid: paravance-12
-          kind: node
-          port: eth1
-        24:
-          uid: paravance-12
-          kind: node
-          port: eth0
-        25:
-          uid: paravance-13
-          kind: node
-          port: eth1
-        26:
-          uid: paravance-13
-          kind: node
-          port: eth0
-        27:
-          uid: paravance-14
-          kind: node
-          port: eth1
-        28:
-          uid: paravance-14
-          kind: node
-          port: eth0
-        29:
-          uid: paravance-15
-          kind: node
-          port: eth1
-        30:
-          uid: paravance-15
-          kind: node
-          port: eth0
-        31:
-          uid: paravance-16
-          kind: node
-          port: eth1
-        32:
-          uid: paravance-16
-          kind: node
-          port: eth0
-        33:
-          uid: paravance-17
-          kind: node
-          port: eth1
-        34:
-          uid: paravance-17
-          kind: node
-          port: eth0
-        35:
-          uid: paravance-18
-          kind: node
-          port: eth1
-        36:
-          uid: paravance-18
-          kind: node
-          port: eth0
-        37:
-          uid: paravance-19
-          kind: node
-          port: eth1
-        38:
-          uid: paravance-19
-          kind: node
-          port: eth0
-        39:
-          uid: paravance-20
-          kind: node
-          port: eth1
-        40:
-          uid: paravance-20
-          kind: node
-          port: eth0
-        41:
-          uid: paravance-21
-          kind: node
-          port: eth1
-        42:
-          uid: paravance-21
-          kind: node
-          port: eth0
-        43:
-          uid: paravance-22
-          kind: node
-          port: eth1
-        44:
-          uid: paravance-22
-          kind: node
-          port: eth0
-        45:
-          uid: paravance-23
-          kind: node
-          port: eth1
-        46:
-          uid: paravance-23
-          kind: node
-          port: eth0
-        47:
-          uid: paravance-24
-          kind: node
-          port: eth1
-        48:
-          uid: paravance-24
-          kind: node
-          port: eth0
-        49:
-          uid: gw-rennes
-          rate: 40000000000
-          kind: router
-        50:
-          uid: gw-rennes
-          rate: 40000000000
-          kind: router
-    2:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      ports:
-        1:
-          uid: paravance-25
-          kind: node
-          port: eth1
-        2:
-          uid: paravance-25
-          kind: node
-          port: eth0
-        3:
-          uid: paravance-26
-          kind: node
-          port: eth1
-        4:
-          uid: paravance-26
-          kind: node
-          port: eth0
-        5:
-          uid: paravance-27
-          kind: node
-          port: eth1
-        6:
-          uid: paravance-27
-          kind: node
-          port: eth0
-        7:
-          uid: paravance-28
-          kind: node
-          port: eth1
-        8:
-          uid: paravance-28
-          kind: node
-          port: eth0
-        9:
-          uid: paravance-29
-          kind: node
-          port: eth1
-        10:
-          uid: paravance-29
-          kind: node
-          port: eth0
-        11:
-          uid: paravance-30
-          kind: node
-          port: eth1
-        12:
-          uid: paravance-30
-          kind: node
-          port: eth0
-        13:
-          uid: paravance-31
-          kind: node
-          port: eth1
-        14:
-          uid: paravance-31
-          kind: node
-          port: eth0
-        15:
-          uid: paravance-32
-          kind: node
-          port: eth1
-        16:
-          uid: paravance-32
-          kind: node
-          port: eth0
-        17:
-          uid: paravance-33
-          kind: node
-          port: eth1
-        18:
-          uid: paravance-33
-          kind: node
-          port: eth0
-        19:
-          uid: paravance-34
-          kind: node
-          port: eth1
-        20:
-          uid: paravance-34
-          kind: node
-          port: eth0
-        21:
-          uid: paravance-35
-          kind: node
-          port: eth1
-        22:
-          uid: paravance-35
-          kind: node
-          port: eth0
-        23:
-          uid: paravance-36
-          kind: node
-          port: eth1
-        24:
-          uid: paravance-36
-          kind: node
-          port: eth0
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: port-channel%CHANNELID%
-    2:
-      - linecard: 1
-        port: 49
-        rate: 40000000000
-      - linecard: 1
-        port: 50
-        rate: 40000000000
diff --git a/generators/input/sites/rennes/net-links/paravance-sw-2.yaml b/generators/input/sites/rennes/net-links/paravance-sw-2.yaml
deleted file mode 100644
index 98d4f2df66..0000000000
--- a/generators/input/sites/rennes/net-links/paravance-sw-2.yaml
+++ /dev/null
@@ -1,326 +0,0 @@
----
-paravance-sw-2:
-  model: Nexus 56128P
-  kind: switch
-  site: rennes
-  snmp_community: public
-  routes: {}
-  backplane_bps: 1440000000000
-  mtu: 1500
-  linecards:
-    1:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      ports:
-        1:
-          uid: paravance-37
-          kind: node
-          port: eth1
-        2:
-          uid: paravance-37
-          kind: node
-          port: eth0
-        3:
-          uid: paravance-38
-          kind: node
-          port: eth1
-        4:
-          uid: paravance-38
-          kind: node
-          port: eth0
-        5:
-          uid: paravance-39
-          kind: node
-          port: eth1
-        6:
-          uid: paravance-39
-          kind: node
-          port: eth0
-        7:
-          uid: paravance-40
-          kind: node
-          port: eth1
-        8:
-          uid: paravance-40
-          kind: node
-          port: eth0
-        9:
-          uid: paravance-41
-          kind: node
-          port: eth1
-        10:
-          uid: paravance-41
-          kind: node
-          port: eth0
-        11:
-          uid: paravance-42
-          kind: node
-          port: eth1
-        12:
-          uid: paravance-42
-          kind: node
-          port: eth0
-        13:
-          uid: paravance-43
-          kind: node
-          port: eth1
-        14:
-          uid: paravance-43
-          kind: node
-          port: eth0
-        15:
-          uid: paravance-44
-          kind: node
-          port: eth1
-        16:
-          uid: paravance-44
-          kind: node
-          port: eth0
-        17:
-          uid: paravance-45
-          kind: node
-          port: eth1
-        18:
-          uid: paravance-45
-          kind: node
-          port: eth0
-        19:
-          uid: paravance-46
-          kind: node
-          port: eth1
-        20:
-          uid: paravance-46
-          kind: node
-          port: eth0
-        21:
-          uid: paravance-47
-          kind: node
-          port: eth1
-        22:
-          uid: paravance-47
-          kind: node
-          port: eth0
-        23:
-          uid: paravance-48
-          kind: node
-          port: eth1
-        24:
-          uid: paravance-48
-          kind: node
-          port: eth0
-        25:
-          uid: paravance-49
-          kind: node
-          port: eth1
-        26:
-          uid: paravance-49
-          kind: node
-          port: eth0
-        27:
-          uid: paravance-50
-          kind: node
-          port: eth1
-        28:
-          uid: paravance-50
-          kind: node
-          port: eth0
-        29:
-          uid: paravance-51
-          kind: node
-          port: eth1
-        30:
-          uid: paravance-51
-          kind: node
-          port: eth0
-        31:
-          uid: paravance-52
-          kind: node
-          port: eth1
-        32:
-          uid: paravance-52
-          kind: node
-          port: eth0
-        33:
-          uid: paravance-53
-          kind: node
-          port: eth1
-        34:
-          uid: paravance-53
-          kind: node
-          port: eth0
-        35:
-          uid: paravance-54
-          kind: node
-          port: eth1
-        36:
-          uid: paravance-54
-          kind: node
-          port: eth0
-        37:
-          uid: paravance-55
-          kind: node
-          port: eth1
-        38:
-          uid: paravance-55
-          kind: node
-          port: eth0
-        39:
-          uid: paravance-56
-          kind: node
-          port: eth1
-        40:
-          uid: paravance-56
-          kind: node
-          port: eth0
-        41:
-          uid: paravance-57
-          kind: node
-          port: eth1
-        42:
-          uid: paravance-57
-          kind: node
-          port: eth0
-        43:
-          uid: paravance-58
-          kind: node
-          port: eth1
-        44:
-          uid: paravance-58
-          kind: node
-          port: eth0
-        45:
-          uid: paravance-59
-          kind: node
-          port: eth1
-        46:
-          uid: paravance-59
-          kind: node
-          port: eth0
-        47:
-          uid: paravance-60
-          kind: node
-          port: eth1
-        48:
-          uid: paravance-60
-          kind: node
-          port: eth0
-        51:
-          uid: gw-rennes
-          rate: 40000000000
-          kind: router
-        52:
-          uid: gw-rennes
-          rate: 40000000000
-          kind: router
-    2:
-      naming_pattern: "Ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      rate: 10000000000
-      ports:
-        1:
-          uid: paravance-61
-          kind: node
-          port: eth1
-        2:
-          uid: paravance-61
-          kind: node
-          port: eth0
-        3:
-          uid: paravance-62
-          kind: node
-          port: eth1
-        4:
-          uid: paravance-62
-          kind: node
-          port: eth0
-        5:
-          uid: paravance-63
-          kind: node
-          port: eth1
-        6:
-          uid: paravance-63
-          kind: node
-          port: eth0
-        7:
-          uid: paravance-64
-          kind: node
-          port: eth1
-        8:
-          uid: paravance-64
-          kind: node
-          port: eth0
-        9:
-          uid: paravance-65
-          kind: node
-          port: eth1
-        10:
-          uid: paravance-65
-          kind: node
-          port: eth0
-        11:
-          uid: paravance-66
-          kind: node
-          port: eth1
-        12:
-          uid: paravance-66
-          kind: node
-          port: eth0
-        13:
-          uid: paravance-67
-          kind: node
-          port: eth1
-        14:
-          uid: paravance-67
-          kind: node
-          port: eth0
-        15:
-          uid: paravance-68
-          kind: node
-          port: eth1
-        16:
-          uid: paravance-68
-          kind: node
-          port: eth0
-        17:
-          uid: paravance-69
-          kind: node
-          port: eth1
-        18:
-          uid: paravance-69
-          kind: node
-          port: eth0
-        19:
-          uid: paravance-70
-          kind: node
-          port: eth1
-        20:
-          uid: paravance-70
-          kind: node
-          port: eth0
-        21:
-          uid: paravance-71
-          kind: node
-          port: eth1
-        22:
-          uid: paravance-71
-          kind: node
-          port: eth0
-        23:
-          uid: paravance-72
-          kind: node
-          port: eth1
-        24:
-          uid: paravance-72
-          kind: node
-          port: eth0
-  channels:
-    naming_pattern: Po%CHANNELID%
-    snmp_pattern: port-channel%CHANNELID%
-    3:
-      - linecard: 1
-        port: 51
-        rate: 40000000000
-      - linecard: 1
-        port: 52
-        rate: 40000000000
diff --git a/generators/input/sites/rennes/pdus.rb b/generators/input/sites/rennes/pdus.rb
deleted file mode 100644
index c657f665df..0000000000
--- a/generators/input/sites/rennes/pdus.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-site :rennes do |site_uid|
-
-  4.times do |i|
-    pdu "parapide-pdu-#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP7851"
-      sensors [
-        {
-          :power => {
-            :per_outlets => false,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W"
-            }
-          }
-        }
-      ]
-    end
-  end
-
-  6.times do |i|
-    pdu "parapluie-pdu-#{i+1}" do |pdu_uid|
-      vendor "Eaton Corporation"
-      model ""
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0"
-            }
-          }
-        }
-      ]
-    end
-  end
-
-  8.times do |i|
-    pdu "paravance-pdu-#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP8659"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
-            }
-          }
-        }
-      ]
-    end
-  end
-
-  4.times do |i|
-    pdu "parasilo-pdu-#{i+1}" do |pdu_uid|
-      vendor "APC"
-      model "AP8659"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.318.1.1.12.1.16.0"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7"
-            }
-          }
-        }
-      ]
-    end
-  end
-
-end
diff --git a/generators/input/sites/rennes/rennes.rb b/generators/input/sites/rennes/rennes.rb
deleted file mode 100644
index ed47ae7453..0000000000
--- a/generators/input/sites/rennes/rennes.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :rennes do |site_uid|
-  name "Rennes"
-  location "Rennes, France"
-  web "http://www.irisa.fr"
-  description "Grid5000 Rennes site"
-  latitude 48.1000
-  longitude -1.6667
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.24.0.0/14"
-  virt_ip_range "10.156.0.0/14"
-  storage5k true
-  production true
-
-  g5ksubnet({
-    :network => '10.156.0.0/14',
-    :gateway => '10.159.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.96.0/20',
-      :gateway => '172.16.111.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.111.101'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.111.102'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.111.103'
-    },
-    '4' => {
-      :network => '10.24.0.0/18',
-      :gateway => '10.24.63.254'
-    },
-    '5' => {
-      :network => '10.24.64.0/18',
-      :gateway => '10.24.127.254'
-    },
-    '6' => {
-      :network => '10.24.128.0/18',
-      :gateway => '10.24.191.254'
-    },
-    '7' => {
-      :network => '10.24.192.0/18',
-      :gateway => '10.24.255.254'
-    },
-    '8' => {
-      :network => '10.25.0.0/18',
-      :gateway => '10.25.63.254'
-    },
-    '9' => {
-      :network => '10.25.64.0/18',
-      :gateway => '10.25.127.254'
-    },
-    '16' => {
-      :network => '10.27.192.0/18',
-      :gateway => '10.27.255.254'
-    },
-  })
-
-end
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-1.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-1.yaml
deleted file mode 100644
index 878c6f299b..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-1.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-1:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e7:d0
-      ip6: fe80::216:36ff:fe91:e7d0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.1
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e7:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:c8
-      ip: 172.17.129.1
-  chassis:
-    serial_number: 0650QBT132
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-10.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-10.yaml
deleted file mode 100644
index ef563f180d..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-10.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-10:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:d0
-      ip6: fe80::216:36ff:fe91:ebd0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.10
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:9a
-      ip: 172.17.129.10
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT12E
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-11.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-11.yaml
deleted file mode 100644
index 5de4d3093e..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-11.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-11:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:dc
-      ip6: fe80::216:36ff:fe91:e9dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.11
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:42
-      ip: 172.17.129.11
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT134
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-12.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-12.yaml
deleted file mode 100644
index cf91fd3728..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-12.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-12:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:60
-      ip6: fe80::216:36ff:fe91:eb60
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.12
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:8e
-      ip: 172.17.129.12
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT10A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-13.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-13.yaml
deleted file mode 100644
index aa2dfd0748..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-13.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-13:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:5c
-      ip6: fe80::216:36ff:fe91:e85c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.13
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e8:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:d9
-      ip: 172.17.129.13
-  chassis:
-    serial_number: 0650QBT111
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-14.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-14.yaml
deleted file mode 100644
index 21c5183955..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-14.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-14:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:fb:e4
-      ip6: fe80::216:36ff:fec9:fbe4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.14
-    eth1:
-      mounted: false
-      mac: 00:16:36:c9:fb:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0b:1a
-      ip: 172.17.129.14
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT119
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-15.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-15.yaml
deleted file mode 100644
index 3417447cb0..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-15.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-15:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:fb:34
-      ip6: fe80::216:36ff:fec9:fb34
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.15
-    eth1:
-      mounted: false
-      mac: 00:16:36:c9:fb:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0a:cb
-      ip: 172.17.129.15
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT11A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-16.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-16.yaml
deleted file mode 100644
index 1b267fb447..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-16.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-16:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:fb:94
-      ip6: fe80::216:36ff:fec9:fb94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.16
-    eth1:
-      mounted: false
-      mac: 00:16:36:c9:fb:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0b:06
-      ip: 172.17.129.16
-  chassis:
-    serial_number: 0650QBT10F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-17.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-17.yaml
deleted file mode 100644
index ea1ec38bf9..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-17.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-17:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c5:8a:83
-      ip6: fe80::216:36ff:fec5:8a83
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.17
-    eth1:
-      mounted: false
-      mac: 00:16:36:c5:8a:84
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:ed
-      ip: 172.17.129.17
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT113
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-18.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-18.yaml
deleted file mode 100644
index 5c51474a6a..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-18.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-18:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ec:14
-      ip6: fe80::216:36ff:fe91:ec14
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.18
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ec:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:b9
-      ip: 172.17.129.18
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT118
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-19.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-19.yaml
deleted file mode 100644
index 5c1e129a14..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-19.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-19:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:c0
-      ip6: fe80::216:36ff:fe91:eac0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.19
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:73
-      ip: 172.17.129.19
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT126
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-2.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-2.yaml
deleted file mode 100644
index 3ea3376276..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-2.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-2:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:84
-      ip6: fe80::216:36ff:fe91:eb84
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.2
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:97
-      ip: 172.17.129.2
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT108
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-20.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-20.yaml
deleted file mode 100644
index ae342c16e0..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-20.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-20:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:74
-      ip6: fe80::216:36ff:fe91:e974
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.20
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:19
-      ip: 172.17.129.20
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT11B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-21.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-21.yaml
deleted file mode 100644
index 69abdaa7a5..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-21.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-21:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ec:24
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.21
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ec:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac:
-      ip: 172.17.129.21
-  chassis:
-    serial_number: 0650QBT11C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-22.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-22.yaml
deleted file mode 100644
index a5b4b40e22..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-22.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-22:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:d8
-      ip6: fe80::216:36ff:fe91:e9d8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.22
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:43
-      ip: 172.17.129.22
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT12B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-23.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-23.yaml
deleted file mode 100644
index 4180fff6ea..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-23.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-23:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:1c
-      ip6: fe80::216:36ff:fe91:eb1c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.23
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac:
-      ip: 172.17.129.23
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT116
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-24.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-24.yaml
deleted file mode 100644
index b0eb0edb4a..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-24.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-24:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:ec
-      ip6: fe80::216:36ff:fe91:e9ec
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.24
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:47
-      ip: 172.17.129.24
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT129
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-25.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-25.yaml
deleted file mode 100644
index 5f656ea469..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-25.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-25:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:2c
-      ip6: fe80::216:36ff:fe91:eb2c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.25
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f6
-      ip: 172.17.129.25
-  block_devices:
-    sda:
-      model: SEAGATE ST32500N
-      device: sda
-      size: 250059350016
-      rev: 3.0
-      vendor: Seagate
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT11F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-26.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-26.yaml
deleted file mode 100644
index e7dbe21147..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-26.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-26:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:d4
-      ip6: fe80::216:36ff:fe91:ebd4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.26
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:99
-      ip: 172.17.129.26
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT124
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-27.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-27.yaml
deleted file mode 100644
index f0799ea424..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-27.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-27:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:f0
-      ip6: fe80::216:36ff:fe91:e9f0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.27
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:48
-      ip: 172.17.129.27
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT106
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-28.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-28.yaml
deleted file mode 100644
index d4d088e8e4..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-28.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-28:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:2c
-      ip6: fe80::216:36ff:fe91:e82c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.28
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e8:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:df
-      ip: 172.17.129.28
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT12A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-29.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-29.yaml
deleted file mode 100644
index 1ff655c75a..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-29.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-29:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:49:87
-      ip6: fe80::260:ddff:fe47:4987
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.29
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:dc
-      ip6: fe80::216:36ff:fe91:e8dc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.29
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e8:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:27
-      ip: 172.17.129.29
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT127
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-3.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-3.yaml
deleted file mode 100644
index 8fcd4bf96c..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-3.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-3:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:24
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.3
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f4
-      ip: 172.17.129.3
-  chassis:
-    serial_number: 0650QBT10B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-30.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-30.yaml
deleted file mode 100644
index d0a79a1dd3..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-30.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-30:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:0d:c3
-      ip6: fe80::260:ddff:fe47:dc3
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.30
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:94
-      ip6: fe80::216:36ff:fe91:ea94
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.30
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:7b
-      ip: 172.17.129.30
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT136
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-31.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-31.yaml
deleted file mode 100644
index aab29f9562..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-31.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-31:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:0d:bf
-      ip6: fe80::260:ddff:fe47:dbf
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.31
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:f9:80
-      ip6: fe80::216:36ff:fec9:f980
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.31
-    eth1:
-      mounted: false
-      mac: 00:16:36:c9:f9:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0a:7e
-      ip: 172.17.129.31
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT10D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-32.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-32.yaml
deleted file mode 100644
index f343ca1399..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-32.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-32:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:43
-      ip6: fe80::260:ddff:fe47:4c43
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.32
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:94
-      ip6: fe80::216:36ff:fe91:e994
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.32
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:08
-      ip: 172.17.129.32
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT122
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-33.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-33.yaml
deleted file mode 100644
index ac05af523e..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-33.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-33:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:44
-      ip6: fe80::260:ddff:fe47:4c44
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.33
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:84
-      ip6: fe80::216:36ff:fe91:ea84
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.33
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:72
-      ip: 172.17.129.33
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT125
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-34.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-34.yaml
deleted file mode 100644
index 9aa3d7a9e2..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-34.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-34:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:42
-      ip6: fe80::260:ddff:fe47:4c42
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.34
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:dc
-      ip6: fe80::216:36ff:fe91:ebdc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.34
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:9f
-      ip: 172.17.129.34
-  block_devices:
-    sda:
-      model: SEAGATE ST32500N
-      device: sda
-      size: 250059350016
-      rev: 3.0
-      vendor: Seagate
-  chassis:
-    serial_number: 0650QBT114
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-35.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-35.yaml
deleted file mode 100644
index ff188407fe..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-35.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-35:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:69
-      ip6: fe80::260:ddff:fe47:4c69
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.35
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:08
-      ip6: fe80::216:36ff:fe91:ea08
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.35
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f1
-      ip: 172.17.129.35
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT112
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-36.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-36.yaml
deleted file mode 100644
index e2cceed417..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-36.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-36:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:DD:47:4C:45
-      ip6: fe80::260:ddff:fe47:4c45
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.36
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:08
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.36
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f7
-      ip: 172.17.129.36
-  chassis:
-    serial_number: 0650QBT10B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-37.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-37.yaml
deleted file mode 100644
index 6fe8688f34..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-37.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-37:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6d
-      ip6: fe80::260:ddff:fe47:4c6d
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.37
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:a4
-      ip6: fe80::216:36ff:fe91:e9a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.37
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:0c
-      ip: 172.17.129.37
-  chassis:
-    serial_number: 0650QBT120
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-38.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-38.yaml
deleted file mode 100644
index 79a9ef18eb..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-38.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-38:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:49
-      ip6: fe80::260:ddff:fe47:4c49
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.38
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:6c
-      ip6: fe80::216:36ff:fe91:e86c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.38
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e8:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:e1
-      ip: 172.17.129.38
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT123
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-39.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-39.yaml
deleted file mode 100644
index 87efa1e3bd..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-39.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-39:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:33
-      ip6: fe80::260:ddff:fe47:4c33
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.39
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ec:20
-      ip6: fe80::216:36ff:fe91:ec20
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.39
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ec:21
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:bf
-      ip: 172.17.129.39
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT10C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-4.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-4.yaml
deleted file mode 100644
index 787ef3fb72..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-4.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-4:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:d4
-      ip6: fe80::216:36ff:fe91:e9d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.4
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:41
-      ip: 172.17.129.4
-  chassis:
-    serial_number: 0650QBT12C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-40.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-40.yaml
deleted file mode 100644
index 2a2f416154..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-40.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-40:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6e
-      ip6: fe80::260:ddff:fe47:4c6e
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.40
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:08
-      ip6: fe80::216:36ff:fe91:eb08
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.40
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:eb
-      ip: 172.17.129.40
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT11D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-41.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-41.yaml
deleted file mode 100644
index 966270166d..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-41.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-41:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:2d
-      ip6: fe80::260:ddff:fe47:4d2d
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.41
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:f8
-      ip6: fe80::216:36ff:fe91:eaf8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.41
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:e7
-      ip: 172.17.129.41
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT12D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-42.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-42.yaml
deleted file mode 100644
index a4685c5a9d..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-42.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-42:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:34
-      ip6: fe80::260:ddff:fe47:4c45
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.42
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:90
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.42
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:79
-      ip: 172.17.129.42
-  chassis:
-    serial_number: 0650QBT10B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-43.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-43.yaml
deleted file mode 100644
index 6b88bab660..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-43.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-43:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:48
-      ip6: fe80::260:ddff:fe47:4c48
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.43
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:fc
-      ip6: fe80::216:36ff:fe91:eafc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.43
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:e8
-      ip: 172.17.129.43
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT12F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-44.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-44.yaml
deleted file mode 100644
index eb770c0956..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-44.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-44:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:45
-      ip6: fe80::260:ddff:fe47:4c45
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.44
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:18
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.44
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:19
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:33
-      ip: 172.17.129.44
-  chassis:
-    serial_number: 0650QBT10B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-45.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-45.yaml
deleted file mode 100644
index a288897ca6..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-45.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-45:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:35
-      ip6: fe80::260:ddff:fe47:4c35
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.45
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:58
-      ip6: fe80::216:36ff:fe91:e958
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.45
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:12
-      ip: 172.17.129.45
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT135
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-46.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-46.yaml
deleted file mode 100644
index 3fba4cd642..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-46.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-46:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:47
-      ip6: fe80::260:ddff:fe47:4c47
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.46
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:80
-      ip6: fe80::216:36ff:fe91:eb80
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.46
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:96
-      ip: 172.17.129.46
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT131
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-47.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-47.yaml
deleted file mode 100644
index 91b2fe097f..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-47.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-47:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:32
-      ip6: fe80::260:ddff:fe47:4c32
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.47
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e9:26:c6
-      ip6: fe80::216:36ff:fee9:26c6
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.47
-    eth1:
-      mounted: false
-      mac: 00:16:36:e9:26:c7
-      management: false
-      mountable: false
-      driver: forcedeth
-      enabled: false
-      interface: Ethernet
-    bmc:
-      mac: 00:16:36:e9:2f:a2
-      ip: 172.17.129.47
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-48.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-48.yaml
deleted file mode 100644
index 84091fcddf..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-48.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-48:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:46
-      ip6: fe80::260:ddff:fe47:4c46
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.48
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:28
-      ip6: fe80::216:36ff:fe91:eb28
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.48
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f5
-      ip: 172.17.129.48
-  chassis:
-    serial_number: 0650QBT133
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-49.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-49.yaml
deleted file mode 100644
index c8437477cb..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-49.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-49:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6a
-      ip6: fe80::260:ddff:fe47:4c6a
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.49
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c5:89:17
-      ip6: fe80::216:36ff:fec5:8917
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.49
-    eth1:
-      mounted: false
-      mac: 00:16:36:c5:89:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:7f
-      ip: 172.17.129.49
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT110
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-5.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-5.yaml
deleted file mode 100644
index 91839cee4c..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-5.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-5:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:e8
-      ip6: fe80::216:36ff:fe91:e8e8
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.5
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e8:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:2a
-      ip: 172.17.129.5
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 0650QBT107
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-50.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-50.yaml
deleted file mode 100644
index 3931600432..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-50.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
----
-sol-50:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:30
-      ip6: fe80::260:ddff:fe47:4c30
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.50
-      driver: mx ethernet (myri)
-      mountable: true
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:e0
-      ip6: fe80::216:36ff:fe91:e9e0
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.50
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:44
-      ip: 172.17.129.50
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-6.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-6.yaml
deleted file mode 100644
index 90a406c8a3..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-6.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-6:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:70
-      ip6: fe80::216:36ff:fe91:e870
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.6
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e8:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:e3
-      ip: 172.17.129.6
-  chassis:
-    serial_number: 0650QBT130
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-7.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-7.yaml
deleted file mode 100644
index 4eb531c1d0..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-7.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-7:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:d4
-      ip6: fe80::216:36ff:fe91:ead4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.7
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:7c
-      ip: 172.17.129.7
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 0650QBT109
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-8.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-8.yaml
deleted file mode 100644
index 47d1aac285..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-8.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-8:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c5:8a:87
-      ip6: fe80::216:36ff:fec5:8a87
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.8
-    eth1:
-      mounted: false
-      mac: 00:16:36:c5:8a:88
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:ee
-      ip: 172.17.129.8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT115
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/nodes/sol-9.yaml b/generators/input/sites/sophia/clusters/sol/nodes/sol-9.yaml
deleted file mode 100644
index d0c5fe15b8..0000000000
--- a/generators/input/sites/sophia/clusters/sol/nodes/sol-9.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-sol-9:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:90
-      ip6: fe80::216:36ff:fe91:e990
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: forcedeth
-      mountable: true
-      ip: 172.16.129.9
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:e9:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:07
-      ip: 172.17.129.9
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0650QBT128
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/sophia/clusters/sol/sol.rb b/generators/input/sites/sophia/clusters/sol/sol.rb
deleted file mode 100644
index b0a37221c5..0000000000
--- a/generators/input/sites/sophia/clusters/sol/sol.rb
+++ /dev/null
@@ -1,277 +0,0 @@
-site :sophia do |site_uid|
-
-  cluster :sol do |cluster_uid|
-    model "Sun Fire X2200 M2"
-    created_at Time.parse("2007-02-23").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    # Nodes 1 -> 28 : No myri0 interface
-    28.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 4337000000,
-          :node_flops => 16800000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "sata_nv",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'nVidia',
-          :version          => "MCP55 Pro",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('sophia', 'sol', node_uid),
-          :switch_port      => net_port_lookup('sophia', 'sol', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'nVidia',
-          :version          => "MCP55 Pro",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => lookup(node_uid, node_uid, 'network_interfaces','bmc', 'ip'),
-          :mac => lookup(node_uid, node_uid, 'network_interfaces','bmc', 'mac'),
-          :enabled  => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :device => "bmc"
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-    # Nodes 29 -> 50 : myri0 interfaces
-    22.times do |i|
-      node "#{cluster_uid}-#{i+29}" do |node_uid|
-
-        performance({
-          :core_flops => 4337000000,
-          :node_flops => 16800000000
-        })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
-          :release  => "Jessie",
-          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
-          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "sata_nv",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev')
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'nVidia',
-          :version          => "MCP55 Pro",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('sophia', 'sol', node_uid),
-          :switch_port      => net_port_lookup('sophia', 'sol', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'nVidia',
-          :version          => "MCP55 Pro",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => lookup(node_uid, node_uid, 'network_interfaces','bmc', 'ip'),
-          :mac => lookup(node_uid, node_uid, 'network_interfaces','bmc', 'mac'),
-          :enabled  => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :device => "bmc"
-        },
-        {
-          :interface            => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'interface'),
-          :rate                 => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'rate'),
-          :network_address      => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
-          :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'ip'),
-          :ip6                  => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'ip6'),
-          :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'mac'),
-          :vendor               => 'Myricom',
-          :version              => "M3F-PCIXF-2",
-          :driver               => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'driver'),
-          :enabled              => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'enabled'),
-          :management           => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'management'),
-          :mountable            => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'mountable'),
-          :mounted              => lookup(node_uid, node_uid, 'network_interfaces', 'myri0', 'mounted'),
-          :management           => false,
-          :device               => "myri0",
-          :switch               => 'sw-myrinet'
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-
-  end
-
-end
diff --git a/generators/input/sites/sophia/clusters/sol/sol_manual.yaml b/generators/input/sites/sophia/clusters/sol/sol_manual.yaml
deleted file mode 100644
index eaf00e4a48..0000000000
--- a/generators/input/sites/sophia/clusters/sol/sol_manual.yaml
+++ /dev/null
@@ -1,251 +0,0 @@
----
-sol-1:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/1
-sol-2:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/3
-sol-3:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/5
-sol-4:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/7
-sol-5:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/9
-sol-6:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/11
-sol-7:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/13
-sol-8:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/15
-sol-9:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/17
-sol-10:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/19
-sol-11:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/21
-sol-12:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/23
-sol-13:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/1
-sol-14:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/3
-sol-15:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/5
-sol-16:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/7
-sol-17:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/9
-sol-18:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/11
-sol-19:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/13
-sol-20:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/15
-sol-21:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/17
-sol-22:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/19
-sol-23:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/21
-sol-24:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/23
-sol-25:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/2
-sol-26:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/4
-sol-27:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/6
-sol-28:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/8
-sol-29:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/10
-sol-30:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/12
-sol-31:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/14
-sol-32:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/16
-sol-33:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/18
-sol-34:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/20
-sol-35:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/22
-sol-36:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 3/24
-sol-37:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/2
-sol-38:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/4
-sol-39:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/6
-sol-40:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/8
-sol-41:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/10
-sol-42:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/12
-sol-43:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/14
-sol-44:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/16
-sol-45:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/18
-sol-46:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/20
-sol-47:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/22
-sol-48:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 4/24
-sol-49:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 9/1
-sol-50:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 9/3
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-1.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-1.yaml
deleted file mode 100644
index 19b591c835..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-1:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:58:e6:82
-      ip6: fe80::226:b9ff:fe58:e682
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.1
-    eth1:
-      mounted: false
-      mac: 00:26:b9:58:e6:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:58:e6:84
-      ip: 172.17.130.1
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: ''
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-10.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-10.yaml
deleted file mode 100644
index 3d8f7c912a..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-10:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:65
-      ip6: fe80::226:b9ff:fe3f:4965
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.10
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:67
-      ip: 172.17.130.10
-  chassis:
-    serial_number: G4JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-11.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-11.yaml
deleted file mode 100644
index eb07890a27..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-11:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:0c
-      ip6: fe80::226:b9ff:fe3f:470c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.11
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:0d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:0e
-      ip: 172.17.130.11
-  chassis:
-    serial_number: H3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-12.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-12.yaml
deleted file mode 100644
index 4aebfc699d..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-12:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:5c
-      ip6: fe80::226:b9ff:fe3f:495c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.12
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:5e
-      ip: 172.17.130.12
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 45JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-13.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-13.yaml
deleted file mode 100644
index 5cdb609efa..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-13:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4c:78
-      ip6: fe80::226:b9ff:fe3f:4c78
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.13
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4c:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4c:7a
-      ip: 172.17.130.13
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 15JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-14.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-14.yaml
deleted file mode 100644
index ba1ddc8e2a..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-14:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:61
-      ip6: fe80::226:b9ff:fe3f:4a61
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.14
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:63
-      ip: 172.17.130.14
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 95JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-15.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-15.yaml
deleted file mode 100644
index de6ea37ddc..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-15:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:44:89
-      ip6: fe80::226:b9ff:fe3f:4489
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.15
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:44:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:44:8b
-      ip: 172.17.130.15
-  chassis:
-    serial_number: F3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-16.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-16.yaml
deleted file mode 100644
index 02b119bcb6..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-16:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:0c
-      ip6: fe80::226:b9ff:fe3f:410c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.16
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:41:0d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:0e
-      ip: 172.17.130.16
-  chassis:
-    serial_number: 33JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-17.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-17.yaml
deleted file mode 100644
index 928edafffb..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-17:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:db
-      ip6: fe80::226:b9ff:fe3f:47db
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.17
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:dc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:dd
-      ip: 172.17.130.17
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 54JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-18.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-18.yaml
deleted file mode 100644
index f9d3ce8a4a..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-18:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:35:c4:83
-      ip6: fe80::226:b9ff:fe35:c483
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.18
-    eth1:
-      mounted: false
-      mac: 00:26:b9:35:c4:84
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:35:c4:85
-      ip: 172.17.130.18
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  chassis:
-    serial_number: 13JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-19.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-19.yaml
deleted file mode 100644
index 0d1b89db8e..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-19:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:40:67
-      ip6: fe80::226:b9ff:fe3f:4067
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.19
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:40:68
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:40:69
-      ip: 172.17.130.19
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 74JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-2.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-2.yaml
deleted file mode 100644
index e8a913a353..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-2:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:38
-      ip6: fe80::226:b9ff:fe3f:4938
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.2
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:3a
-      ip: 172.17.130.2
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: B5JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-20.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-20.yaml
deleted file mode 100644
index a066e9318a..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-20:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:46:12
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.20
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:46:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:46:14
-      ip: 172.17.130.20
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 43JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-21.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-21.yaml
deleted file mode 100644
index 9c9a514e92..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-21:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3f:fb
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.21
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:3f:fc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3f:fd
-      ip: 172.17.130.21
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 85JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-22.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-22.yaml
deleted file mode 100644
index 5d9a453e0d..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-22:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:66
-      ip6: fe80::226:b9ff:fe3f:4766
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.22
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:68
-      ip: 172.17.130.22
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 55JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-23.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-23.yaml
deleted file mode 100644
index 40fed5294b..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-23:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:dc
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.23
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:de
-      ip: 172.17.130.23
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: C5JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-24.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-24.yaml
deleted file mode 100644
index 1eef84fa9e..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-24:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:b4
-      ip6: fe80::226:b9ff:fe3f:47b4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.24
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:b6
-      ip: 172.17.130.24
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: 24JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-25.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-25.yaml
deleted file mode 100644
index 8bc97dcc6e..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-25:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:a2
-      ip6: fe80::226:b9ff:fe3f:47a2
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.25
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:a3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:a4
-      ip: 172.17.130.25
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 44JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-26.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-26.yaml
deleted file mode 100644
index b8c2f46864..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-26:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:4d
-      ip6: fe80::226:b9ff:fe3f:4b4d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.26
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:4f
-      ip: 172.17.130.26
-  chassis:
-    serial_number: 75JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-27.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-27.yaml
deleted file mode 100644
index 58b48d8299..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-27:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:62
-      ip6: fe80::226:b9ff:fe3f:4b62
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.27
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:63
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:64
-      ip: 172.17.130.27
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 35JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-28.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-28.yaml
deleted file mode 100644
index 90eef596b2..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-28:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 299439751168
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:56
-      ip6: fe80::226:b9ff:fe3f:4956
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.28
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:57
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:58
-      ip: 172.17.130.28
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: F4JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-29.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-29.yaml
deleted file mode 100644
index a41c255b19..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-29:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:ba
-      ip6: fe80::226:b9ff:fe3f:47ba
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.29
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:bb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:bc
-      ip: 172.17.130.29
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: D3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-3.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-3.yaml
deleted file mode 100644
index f5b7f3d9ce..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-3:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:5e
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.3
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:5f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:60
-      ip: 172.17.130.3
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 14JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-30.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-30.yaml
deleted file mode 100644
index cef81ca9c0..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-30:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:30
-      ip6: fe80::226:b9ff:fe3f:4130
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.30
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:41:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:32
-      ip: 172.17.130.30
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 63JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-31.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-31.yaml
deleted file mode 100644
index 20267f66bd..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-31:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:56
-      ip6: fe80::226:b9ff:fe3f:4b56
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.31
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:57
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:58
-      ip: 172.17.130.31
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: C4JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-32.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-32.yaml
deleted file mode 100644
index e0439f331e..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-32:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:44:68
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.32
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:44:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:44:6a
-      ip: 172.17.130.32
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: F5JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-33.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-33.yaml
deleted file mode 100644
index c2406838dd..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-33:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3f:67
-      ip6: fe80::226:b9ff:fe3f:3f67
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.33
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:3f:68
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3f:69
-      ip: 172.17.130.33
-  chassis:
-    serial_number: 84JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-34.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-34.yaml
deleted file mode 100644
index afa116a6ff..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-34:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:5f
-      ip6: fe80::226:b9ff:fe3f:495f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.34
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:60
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:61
-      ip: 172.17.130.34
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 53JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-35.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-35.yaml
deleted file mode 100644
index 479e2a48cb..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-35:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3f:1c
-      ip6: fe80::226:b9ff:fe3f:3f1c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.35
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:3f:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3f:1e
-      ip: 172.17.130.35
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: B4JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-36.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-36.yaml
deleted file mode 100644
index ddf24cd6dd..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-36:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:94
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.36
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:96
-      ip: 172.17.130.36
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 94JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-37.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-37.yaml
deleted file mode 100644
index ac6f617893..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-37:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:2c
-      ip6: fe80::226:b9ff:fe3f:4b2c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.37
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:2e
-      ip: 172.17.130.37
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: H4JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-38.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-38.yaml
deleted file mode 100644
index 40cbf8fbc2..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-38:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:44:b3
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.38
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:44:b4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:44:b5
-      ip: 172.17.130.38
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 34JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-39.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-39.yaml
deleted file mode 100644
index 5628c0aebe..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-39:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:2f
-      ip6: fe80::226:b9ff:fe3f:4b2f
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.39
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:30
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:31
-      ip: 172.17.130.39
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  chassis:
-    serial_number: J4JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-4.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-4.yaml
deleted file mode 100644
index 8638b32751..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-4:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:6d
-      ip6: fe80::226:b9ff:fe3f:4a6d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.4
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:6f
-      ip: 172.17.130.4
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: D5JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-40.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-40.yaml
deleted file mode 100644
index cd0c612c51..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-40:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:44
-      ip6: fe80::226:b9ff:fe3f:4944
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.40
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:46
-      ip: 172.17.130.40
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  chassis:
-    serial_number: 65JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-41.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-41.yaml
deleted file mode 100644
index b94138bdec..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-41:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:45:3a
-      ip6: fe80::226:b9ff:fe3f:453a
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.41
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:45:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:45:3c
-      ip: 172.17.130.41
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  chassis:
-    serial_number: J3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-42.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-42.yaml
deleted file mode 100644
index 18b1829985..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-42:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:21
-      ip6: fe80::226:b9ff:fe3f:4121
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.42
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:41:22
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:23
-      ip: 172.17.130.42
-  chassis:
-    serial_number: 93JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-43.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-43.yaml
deleted file mode 100644
index a84e5efc59..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-43:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3e:95
-      ip6: fe80::226:b9ff:fe3f:3e95
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.43
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:3e:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3e:97
-      ip: 172.17.130.43
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  chassis:
-    serial_number: 23JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-44.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-44.yaml
deleted file mode 100644
index e7fad155dd..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-44:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:45:2e
-      ip6: fe80::226:b9ff:fe3f:452e
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.44
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:45:2f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:45:30
-      ip: 172.17.130.44
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  chassis:
-    serial_number: B3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-45.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-45.yaml
deleted file mode 100644
index d25fb47897..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-45:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:7b
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.45
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:7d
-      ip: 172.17.130.45
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 25JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-5.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-5.yaml
deleted file mode 100644
index 8cc65e20a5..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-5:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3e:e8:58
-      ip6: fe80::226:b9ff:fe3e:e858
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.5
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3e:e8:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3e:e8:5a
-      ip: 172.17.130.5
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 73JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-6.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-6.yaml
deleted file mode 100644
index 897e09c77b..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-6:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:40:af
-      ip6: fe80::226:b9ff:fe3f:40af
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.6
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:40:b0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:40:b1
-      ip: 172.17.130.6
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: G3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-7.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-7.yaml
deleted file mode 100644
index 4fcd3c5165..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-7:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:43:a1
-      ip6: fe80::226:b9ff:fe3f:43a1
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.7
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:43:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:43:a3
-      ip: 172.17.130.7
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 64JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-8.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-8.yaml
deleted file mode 100644
index 1736e426d1..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-8:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:3d
-      ip6: fe80::226:b9ff:fe3f:4a3d
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.8
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:3f
-      ip: 172.17.130.8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: C3JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/nodes/suno-9.yaml b/generators/input/sites/sophia/clusters/suno/nodes/suno-9.yaml
deleted file mode 100644
index d0995c3839..0000000000
--- a/generators/input/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-suno-9:
-  bios:
-    version: 1.1.5
-    release_date: 07/29/2009
-    vendor: Dell Inc.
-  block_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  network_interfaces:
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:27
-      ip6: fe80::226:b9ff:fe3f:4127
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.130.9
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:41:28
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:29
-      ip: 172.17.130.9
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial_number: 83JPH4J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/generators/input/sites/sophia/clusters/suno/suno.rb b/generators/input/sites/sophia/clusters/suno/suno.rb
deleted file mode 100644
index 03094d1bee..0000000000
--- a/generators/input/sites/sophia/clusters/suno/suno.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-site :sophia do |site_uid|
-
-  cluster :suno do |cluster_uid|
-    model "Dell PowerEdge R410"
-    created_at Time.parse("2010-01-27").httpdate
-    kavlan true
-    queues ['default', 'admin']
-
-    45.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-          :core_flops => 7140000000,
-          :node_flops => 55460000000
-        })
-
-
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
-          :max_walltime => 0,
-          :queues       => ['default', 'admin']
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Jessie",
-          :version  => "8.2",
-          :kernel   => "3.16.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "megaraid_sas",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :raid       => "0",
-          :storage    => 'HDD'
-        }]
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :device           => "eth0",
-          :vendor           => 'Broadcom',
-          :version          => 'NetXtremeII BCM5716',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('sophia', 'suno', node_uid),
-          :switch_port      => net_port_lookup('sophia', 'suno', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => 'Broadcom',
-          :version          => 'NetXtremeII BCM5716',
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'ip'),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        {
-          :interface        => 'Ethernet',
-          :rate             => 100.M,
-          :enabled          => true,
-          :management       => true,
-          :mountable        => false,
-          :mounted          => false,
-          :device           => "bmc",
-          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :vendor           => "Unknown",
-          :version          => "1.7",
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac')
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-      end
-    end
-  end
-
-end
diff --git a/generators/input/sites/sophia/clusters/suno/suno_manual.yaml b/generators/input/sites/sophia/clusters/suno/suno_manual.yaml
deleted file mode 100644
index 3de2e405bf..0000000000
--- a/generators/input/sites/sophia/clusters/suno/suno_manual.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
----
-suno-1:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/10
-suno-2:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/11
-suno-3:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/1
-suno-4:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/5
-suno-5:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/4
-suno-6:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/7
-suno-7:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/8
-suno-8:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/12
-suno-9:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/9
-suno-10:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/3
-suno-11:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/2
-suno-12:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/6
-suno-13:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/13
-suno-14:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/19
-suno-15:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/17
-suno-16:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/21
-suno-17:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 5/15
-suno-18:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/1
-suno-19:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/2
-suno-20:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/3
-suno-21:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/4
-suno-22:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/5
-suno-23:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/6
-suno-24:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/7
-suno-25:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/8
-suno-26:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/9
-suno-27:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/10
-suno-28:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/11
-suno-29:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/12
-suno-30:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/13
-suno-31:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/14
-suno-32:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/15
-suno-33:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/16
-suno-34:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/17
-suno-35:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 6/18
-suno-36:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/1
-suno-37:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/2
-suno-38:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/3
-suno-39:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/4
-suno-40:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/5
-suno-41:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/6
-suno-42:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/7
-suno-43:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/8
-suno-44:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/9
-suno-45:
-  network_interfaces:
-    eth0:
-      switch_name: gw-sophia
-      switch_port: 7/10
diff --git a/generators/input/sites/sophia/net-links/edgeiron.yaml b/generators/input/sites/sophia/net-links/edgeiron.yaml
deleted file mode 100644
index 8337dc7003..0000000000
--- a/generators/input/sites/sophia/net-links/edgeiron.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-edgeiron:
-  model: Foundry
-  kind: switch
-  site: sophia
-  snmp_community: public
-  weathermap:
-    use_cacti: "no"
-  mtu: 10240
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    snmp_pattern: v%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.143.250
-  routes: {}
-  backplane_bps: 40000000000
-
-  linecards:
-    0:
-      naming_pattern: "%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: router
-      rate: 1000000000
-      ports:
-        1:
-          uid: gw-sophia
-          port: ethernet2/1
-        2:
-          uid: gw-sophia
-          port: ethernet2/2
-    1:
-      naming_pattern: "%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        48: 
-        47: 
-        46: 
-        45: 
-        44: 
-        43: 
-        42: 
-        41: 
-        40: 
-        39: 
-        38: 
-        37: 
-        36: 
-        35: 
-        34: 
-        33: 
-        32: 
-        31: 
-        28: 
-        27: 
-        26: 
-        25: 
-        20: 
-        17: 
-        8: 
-        13: 
-        2: 
-        7: 
-        10: 
-        9: 
-        24: 
-        23: 
-        22: 
-        11: 
-        14: 
-        16: 
-        15: 
-        12: 
-        5: 
-        1: 
-        3: 
-        19: 
-        18: 
-        21: 
-    3:
-      naming_pattern: "%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        13: 
-        29: 
-        1: 
-        2: 
-        12: 
-        11: 
-        10: 
-        9: 
-        8: 
-        7: 
-        6: 
-        5: 
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/sophia/net-links/gw-sophia.yaml b/generators/input/sites/sophia/net-links/gw-sophia.yaml
deleted file mode 100644
index dd6e37b836..0000000000
--- a/generators/input/sites/sophia/net-links/gw-sophia.yaml
+++ /dev/null
@@ -1,289 +0,0 @@
----
-gw-sophia:
-  model: Foundry
-  kind: router
-  site: sophia
-  snmp_community: public
-  mtu: 10240
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    snmp_pattern: v%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.143.254
-    "vlan101":
-      addresses:
-        - 172.17.143.254
-    "vlan500":
-      addresses:
-        - 192.168.4.12
-    "vlan535":
-      addresses:
-        - 193.51.182.221
-    "vlan538":
-      addresses:
-        - 172.16.223.250
-    "vlan540":
-      addresses:
-        - 192.168.69.10
-    "vlan666":
-      addresses:
-        - 194.254.60.61
-    "vlan667":
-      addresses:
-        - 192.168.67.253
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.32.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.32.64.0/18
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.32.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.32.192.0/18
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.33.0.0/18
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.33.64.0/18
-    "vlan718":
-      name: kavlan-18
-      addresses:
-        - 10.35.192.0/18
-  routes: {}
-  backplane_bps: 900000000000
-
-  linecards:
-    1:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
-      kind: switch
-      backplane_bps:
-      rate: 10000000000
-      ports:
-        1:
-          uid: renater-sophia
-          kind: renater
-          site: virtual
-    2:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
-      kind: switch
-      backplane_bps: 20000000000
-      rate: 10000000000
-      ports:
-        1:
-          uid: edgeiron
-          port: 0/1
-        2:
-          uid: edgeiron
-          port: 0/2
-    7:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      backplane_bps: 24000000000
-      rate: 1000000000
-      ports:
-        1: suno-36
-        2: suno-37
-        3: suno-38
-        4: suno-39
-        5: suno-40
-        6: suno-41
-        7: suno-42
-        8: suno-43
-        9: suno-44
-        10: suno-45
-        23:
-          uid: srv
-          port: eth0
-          kind: other
-        24:
-          uid: srv-stock
-          port: eth0
-          kind: other
-        18:
-          uid: srv2
-          port: eth1
-          kind: other
-    3:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      backplane_bps: 24000000000
-      rate: 1000000000
-      ports:
-        1: sol-1
-        3: sol-2
-        5: sol-3
-        7: sol-4
-        9: sol-5
-        11: sol-6
-        13: sol-7
-        15: sol-8
-        17: sol-9
-        19: sol-10
-        21: sol-11
-        23: sol-12
-        2: sol-25
-        4: sol-26
-        6: sol-27
-        8: sol-28
-        10: sol-29
-        12: sol-30
-        14: sol-31
-        16: sol-32
-        18: sol-33
-        20: sol-34
-        22: sol-35
-        24: sol-36
-    4:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      backplane_bps: 24000000000
-      rate: 1000000000
-      ports:
-        1: sol-13
-        3: sol-14
-        5: sol-15
-        7: sol-16
-        9: sol-17
-        11: sol-18
-        13: sol-19
-        15: sol-20
-        17: sol-21
-        19: sol-22
-        21: sol-23
-        23: sol-24
-        2: sol-37
-        4: sol-38
-        6: sol-39
-        8: sol-40
-        10: sol-41
-        12: sol-42
-        14: sol-43
-        16: sol-44
-        18: sol-45
-        20: sol-46
-        22: sol-47
-        24: sol-48
-    9:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: other
-      backplane_bps: 12000000000
-      rate: 1000000000
-      ports:
-        1:
-          uid: sol-49
-          kind: node
-        3:
-          uid: sol-50
-          kind: node
-        6: sw-myrinet
-        10:
-          uid: stock
-          port: eth0
-        12:
-          uid: stock
-          port: eth1
-    5:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      backplane_bps: 24000000000
-      rate: 1000000000
-      ports:
-        10: suno-1
-        11: suno-2
-        1: suno-3
-        5: suno-4
-        4: suno-5
-        7: suno-6
-        8: suno-7
-        12: suno-8
-        9: suno-9
-        3: suno-10
-        2: suno-11
-        6: suno-12
-        13: suno-13
-        19: suno-14
-        17: suno-15
-        21: suno-16
-        15: suno-17
-    6:
-      naming_pattern: "ethernet%LINECARD%/%PORT%"
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      backplane_bps: 24000000000
-      rate: 1000000000
-      ports:
-        1: suno-18
-        2: suno-19
-        3: suno-20
-        4: suno-21
-        5: suno-22
-        6: suno-23
-        7: suno-24
-        8: suno-25
-        9: suno-26
-        10: suno-27
-        11: suno-28
-        12: suno-29
-        13: suno-30
-        14: suno-31
-        15: suno-32
-        16: suno-33
-        17: suno-34
-        18: suno-35
-        19:
-          uid: srv-stock
-          port: eth2
-          kind: other
-        20:
-          uid: srv
-          port: eth1
-          kind: other
-        21:
-          uid: srv
-          port: eth3
-          kind: other
-        22:
-          uid: srv
-          port: eth2
-          kind: other
-        23:
-          uid: srv-stock
-          port: eth3
-          kind: other
-        24:
-          uid: srv-stock
-          port: eth1
-          kind: other
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/sophia/pdus.rb b/generators/input/sites/sophia/pdus.rb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/generators/input/sites/sophia/sophia.rb b/generators/input/sites/sophia/sophia.rb
deleted file mode 100644
index af69a96a07..0000000000
--- a/generators/input/sites/sophia/sophia.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-site :sophia do |site_uid|
-  name "Sophia-Antipolis"
-  location "Sophia-Antipolis, France"
-  web "http://www.grid5000.fr/mediawiki/index.php/Sophia:Home"
-  description "Grid'5000 Sophia-Antipolis site"
-  latitude 43.6161
-  longitude 7.0678
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.32.0.0/14"
-  virt_ip_range "10.164.0.0/14"
-  storage5k true
-  production true
-
-  g5ksubnet({
-    :network => '10.164.0.0/14',
-    :gateway => '10.167.255.254'
-  })
-
-  kavlans({
-    'default' => {
-      :network => '172.16.128.0/20',
-      :gateway => '172.16.143.254'
-    },
-    '1' => {
-      :network => '192.168.192.0/20',
-      :gateway => '172.16.143.121'
-    },
-    '2' => {
-      :network => '192.168.208.0/20',
-      :gateway => '172.16.143.122'
-    },
-    '3' => {
-      :network => '192.168.224.0/20',
-      :gateway => '172.16.143.123'
-    },
-    '4' => {
-      :network => '10.32.0.0/18',
-      :gateway => '10.32.63.254'
-    },
-    '5' => {
-      :network => '10.32.64.0/18',
-      :gateway => '10.32.127.254'
-    },
-    '6' => {
-      :network => '10.32.128.0/18',
-      :gateway => '10.32.191.254'
-    },
-    '7' => {
-      :network => '10.32.192.0/18',
-      :gateway => '10.32.255.254'
-    },
-    '8' => {
-      :network => '10.33.0.0/18',
-      :gateway => '10.33.63.254'
-    },
-    '9' => {
-      :network => '10.33.64.0/18',
-      :gateway => '10.33.127.254'
-    },
-    '18' => {
-      :network => '10.35.192.0/18',
-      :gateway => '10.35.255.254'
-    },
-  })
-
-end
diff --git a/generators/lib/core_extensions.rb b/generators/lib/core_extensions.rb
deleted file mode 100755
index c664827078..0000000000
--- a/generators/lib/core_extensions.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'json/pure'
-
-module JSON
-  module Pure
-    module Generator
-      module GeneratorMethods
-        module Hash
-          
-          private
-          # overwrites json/pure method
-          def json_transform(state)
-            delim = ','
-            delim << state.object_nl
-            result = '{'
-            result << state.object_nl
-            depth = state.depth += 1
-            first = true
-            indent = !state.object_nl.empty?
-            keys.map{|k| k.to_s}.sort.each { |key|
-              value = self[key] || self[key.to_sym]
-              result << delim unless first
-              result << state.indent * depth if indent
-              result << key.to_s.to_json(state)
-              result << state.space_before
-              result << ':'
-              result << state.space
-              result << case value
-                # no idea why this is not handled by json/pure
-              when Fixnum
-                value.to_s
-              else
-                value.to_json(state)
-              end
-              
-              first = false
-            }
-            depth = state.depth -= 1
-            result << state.object_nl
-            result << state.indent * depth if indent if indent
-            result << '}'
-            result
-          end
-        end
-      end
-    end
-  end
-end
-
-class Numeric
-
-  def K;    self*10**3;     end
-  def M;    self*10**6;     end
-  def G;    self*10**9;     end
-  def T;    self*10**12;    end
-
-  {
-    :KiB => 1024, :MiB => 1024**2, :GiB => 1024**3, :TiB => 1024**4,
-    :KB => 1.K/1.024, :MB => 1.M/1.024**2, :GB => 1.G/1.024**3, :TB => 1.T/1.024**4
-  }.each do |method, multiplier|
-    define_method(method) do
-      self*multiplier
-    end
-  end
-end
-
-class String
-  # Really naive pluralization.
-  # TODO: see if it's possible to include a better one (from rails or sthg else)
-  def pluralize
-    self+"s"
-  end
-end
-
-class Hash
-  def recursive_merge!(h)
-    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge!(_new) else _new end  }
-  end
-
-end
-
-
-# for versions of ruby < 1.8.7
-module Enumerable
-  def index_by
-    inject({}) do |accum, elem|
-      accum[yield(elem)] = elem
-      accum
-    end
-  end
-
-  def group_by #:yield:
-    #h = k = e = nil
-    r = Hash.new
-    each{ |e| (r[yield(e)] ||= []) << e }
-    r
-  end
-end
diff --git a/generators/lib/g5k_generator.rb b/generators/lib/g5k_generator.rb
deleted file mode 100755
index a6083093ed..0000000000
--- a/generators/lib/g5k_generator.rb
+++ /dev/null
@@ -1,488 +0,0 @@
-require 'resolv'
-
-module G5K
-  
-  class Tree < Hash
-    attr_reader :contents, :path
-    def write(repository, &block)
-      self[:uid] ||= ""
-      @contents = {}
-      @path = File.join(repository, self[:uid]+".json")
-      self.each do |key, value|
-        if value.is_a? Folder
-          value.write(File.join(repository, self[:uid], key.to_s), &block)
-          @path = File.join(repository, self[:uid], self[:uid]+".json")
-        else
-          @contents.merge!(key => value)
-        end
-      end
-      if !@contents.empty? && !@contents[:uid].empty?
-        yield self
-      end
-    end
-    
-    def valid?
-      true
-      # we could do sthg like: Object.const_get(type.class.name).new(hash_values).valid?
-    end
-  end
-  class Folder < Array
-    attr_reader :path
-    def write(repository, &block)
-      @path = repository
-      self.each do |v| 
-        v.write(repository, &block)
-      end
-      yield self
-    end
-    def valid?
-      true
-    end
-  end
-  class Link < Struct.new(:uid, :refer_to)
-    attr_reader :from, :path
-  
-    def write(repository)
-      @from, @path = [refer_to, File.join(repository, "#{uid}.json")]
-      yield self
-    end
-    def valid?
-      true
-    end
-  end
-
-  class ReferenceGenerator  
-    attr_reader :data
-    attr_reader :config
-    attr_reader :input
-  
-    def method_missing(method, *args)
-      @context.recursive_merge!(method.to_sym => args.first)
-    end
-
-    # Remotly execute commands, and retrieve stdout, stderr, exit code and exit signal.
-    def ssh_exec!(ssh, command)
-      stdout_data = ""
-      stderr_data = ""
-      exit_code = nil
-      exit_signal = nil
-      ssh.open_channel do |channel|
-        channel.exec(command) do |ch, success|
-          unless success
-            abort "FAILED: couldn't execute command (ssh.channel.exec)"
-          end
-          channel.on_data do |ch,data|
-            stdout_data+=data
-          end
-          
-          channel.on_extended_data do |ch,type,data|
-            stderr_data+=data
-          end
-          
-          channel.on_request("exit-status") do |ch,data|
-            exit_code = data.read_long
-          end
-          
-          channel.on_request("exit-signal") do |ch, data|
-            exit_signal = data.read_long
-          end
-        end
-      end
-      ssh.loop
-      [stdout_data, stderr_data, exit_code, exit_signal]
-    end  
-  
-    # Get the IP address corresponding to the host fqdn throught ssh channel
-    def dns_lookup_through_ssh(ssh,fqdn)
-      results = ssh_exec! ssh, "host #{fqdn}"
-      if results[2] == 0
-        results[0].split(" ").reverse[0]
-      else
-        fail "Failed to get ip address of '#{fqdn}' : #{results[1]}"
-      end
-    end
-  
-    def dns_lookup(network_address)
-      Resolv.getaddress(network_address)
-    end
-  
-    # Lookup a key in one of the configuration files passed to the generator
-    #
-    # Usage:
-    #   lookup('nancy', 'nodes', 'paramount-1', 'property_name')
-    # or
-    #   lookup('nancy', 'nodes') { |result| result['paramount-1']['property_name'] }
-    # or
-    #   lookup('nancy') { |result| result['nodes']['paramount-1']['property_name'] }
-    # 
-    # assuming you passed a <tt>nancy.yaml</tt> file to the generator
-    #
-    def lookup(filename, *keys, &block)
-      if config.has_key?(filename)
-        result = config[filename]
-        if !keys.empty?
-          while !keys.empty? do
-            result = result[keys.shift]
-            break if result.nil?
-          end
-        end  
-        if block
-          block.call(result) 
-        else
-          result
-        end
-      else
-        raise ArgumentError, "Cannot fetch the values for '#{keys.inspect}' in the input file '#{filename}'. The config files you gave to me are: '#{config.keys.inspect}'."
-      end
-    end
-
-    # Build portname from snmp_naming_pattern
-    # Example: '3 2 GigabitEthernet%LINECARD%/%PORT%' -> 'GigabitEthernet3/2'
-    def get_portname(lc_num,port_num,pattern)
-      return pattern.sub("%LINECARD%",lc_num.to_s).sub("%PORT%",port_num.to_s)
-    end
-
-    # Load information from network description yaml files
-    def get_net_equipment(site)
-      if $net_equipment.nil?
-        $net_equipment={}
-      end
-      if $net_equipment[site].nil?
-        $net_equipment[site]={}
-        Pathname.glob("generators/input/sites/#{site}/net-links/*.yaml").map  {  |i| i.basename.to_s.sub!(".yaml","") }.each do |equipment_name|
-          netlinks = File.open("generators/input/sites/#{site}/net-links/#{equipment_name}.yaml")
-          $net_equipment[site][equipment_name] = YAML::load_stream( netlinks )
-        end
-      end
-      return $net_equipment[site]
-    end
-
-    # Parse network equipment description and return switch name connected to given node
-    #  In the network description, if the node interface is given (using "port" attribute),
-    #  the interface parameter must be used.
-    def net_switch_lookup(site, cluster, node, interface='')
-      get_net_equipment(site).keys.each do |equipment_name|
-        get_net_equipment(site)[equipment_name][0][equipment_name]["linecards"].each do |(lc_num,lc_content)|
-          lc_content["ports"].each do |(port_num,port_content)|
-            if port_content.is_a?(Hash)
-              netdesc_rport = port_content["port"] || lc_content["port"] || ""
-              if port_content["uid"] == node and netdesc_rport == interface
-                return equipment_name
-              end
-            elsif port_content
-              netdesc_rport = lc_content["port"] || ""
-              if port_content == node and netdesc_rport == interface
-                return equipment_name
-              end
-            end
-          end
-        end
-      end
-      return nil
-    end
-
-    # Parse network equipment description and return switch port connected to given node
-    #  In the network description, if the node interface is given (using "port" attribute),
-    #  the interface parameter must be used.
-    def net_port_lookup(site, cluster, node, interface='')
-      get_net_equipment(site).keys.each do |equipment_name|
-        get_net_equipment(site)[equipment_name][0][equipment_name]["linecards"].each do |(lc_num,lc_content)|
-          lc_content["ports"].each do |(port_num,port_content)|
-            if port_content.is_a?(Hash)
-              netdesc_rport = port_content["port"] || lc_content["port"] || ""
-              if port_content["uid"] == node and netdesc_rport == interface
-                return get_portname(lc_num,port_num,lc_content["snmp_pattern"])
-              end
-            elsif port_content
-              netdesc_rport = lc_content["port"] || ""
-              if port_content == node and netdesc_rport == interface
-                return get_portname(lc_num,port_num,lc_content["snmp_pattern"])
-              end
-            end
-          end
-        end
-      end
-      return nil
-    end
-
-    # This method is used exclusivly for environments. Example:
-    # environment 'squeeze-x64-xen-0.8' do
-    #  available_on %w{grenoble lille lyon nancy rennes sophia}
-    # end    
-    def available_on(sites_uid)
-      env_uid = @context[:uid]
-      old_context = @context 
-      @context = @data
-      sites_uid.each{|site_uid|
-        site site_uid.to_sym, {:discard_content => true} do
-          environment "#{env_uid}", :refer_to => "grid5000/environments/#{env_uid}"    
-        end
-      }
-      @context = old_context
-    end
-    # This doesn't work with Ruby < 1.8.7. Replaced by a call to build_context (see below).
-    #
-    # %w{site cluster environment node service}.each do |method|
-    #   define_method(method) do |uid, *options, &block|
-    #     key = method.pluralize.to_sym
-    #     uid = uid.to_s
-    #     options = options.first || Hash.new
-    #     old_context = @context
-    #     @context[key] ||= G5K::Folder.new
-    #     if options.has_key? :refer_to
-    #       @context[key] << G5K::Link.new(uid, options[:refer_to])
-    #     else    
-    #       # if the same object already exists, we return it for completion/modification
-    #       if (same_trees = @context[key].select{|tree| tree[:uid] == uid}).size > 0
-    #         @context = same_trees.first
-    #       else
-    #         @context[key] << G5K::Tree.new.replace({:uid => uid, :type => method})
-    #         @context = @context[key].last
-    #       end
-    #       block.call(uid) if block
-    #     end
-    #     @context = old_context
-    #   end
-    # end
-  
-    def site(uid, *options, &block)
-      build_context(:sites, uid, *options, &block)
-    end
-    def cluster(uid, *options, &block)
-      build_context(:clusters, uid, *options, &block)
-    end
-    def server(uid, *options, &block)
-      build_context(:servers, uid, *options, &block)
-    end
-    def environment(uid, *options, &block)
-      build_context(:environments, uid, *options, &block)
-    end
-    def network_equipment(uid, *options, &block)
-      build_context(:network_equipments, uid, *options, &block)
-    end
-    def node(uid, *options, &block)
-      build_context(:nodes, uid, *options, &block)
-    end
-    def pdu(uid, *options, &block)
-      build_context(:pdus, uid, *options, &block)
-    end
-    def service(uid, *options, &block)
-      build_context(:services, uid, *options, &block)
-    end
-    def network_equipment(uid, *options, &block)
-      build_context(:network_equipments, uid, *options, &block)
-    end
-    def build_context(key, uid, *options, &block)
-      type = key.to_s.chop
-      uid = uid.to_s
-      options = options.first || Hash.new
-      old_context = @context
-      @context[key] ||= G5K::Folder.new
-      if options.has_key? :refer_to
-        @context[key] << G5K::Link.new(uid, options[:refer_to])
-      else    
-        # if the same object already exists, we return it for completion/modification
-        if (same_trees = @context[key].select{|tree| tree[:uid] == uid}).size > 0
-          @context = same_trees.first
-        else
-          @context[key] << G5K::Tree.new.replace({:uid => uid, :type => type}.merge((options[:discard_content]) ? {:discard_content => true} : {}))
-          @context = @context[key].last
-        end
-        block.call(uid) if block
-      end
-      @context = old_context
-    end
-  
-    # Initializes a new generator that will generate data files in a hierachical way. 
-    # The root of the tree will be named with the value of <tt>data_description[:uid]</tt>.
-    def initialize(data_description = {:uid => ""}, options = {:input => {}, :config => {}})
-      @input = options[:input]
-      raise(ArgumentError, "INPUT cannot be null or empty.") if input.nil? || input.empty?
-      @config = options[:config] || {}
-      @data = G5K::Tree.new.replace(data_description)
-      @context = @data
-    end
-  
-    def generate
-      input.each do |filename, content|
-        eval(content)
-      end
-      @data
-    end
- 
-    def measurement_point_name(measure_point,site)
-      port=measure_point[:port] || measure_point[:measure] || 0
-      measure_point_name="#{port}.#{measure_point[:uid]}.#{site[:uid]}.grid5000.fr"
-      measure_point_name
-    end
-    
-    def count_measurement_points(pdu_info,site_pdu_outlets,site)
-      pdu_info.each do |measure_point|
-        measure_point_name=measurement_point_name(measure_point,site)
-        site_pdu_outlets[measure_point_name]=0 unless site_pdu_outlets.has_key?(measure_point_name)
-        site_pdu_outlets[measure_point_name]+=1
-      end
-    end
-    
-    # compute the annotation for the ["monitoring"]["wattmeter"] section from
-    # A pdu_info array representing all the pdus to take into account for a view of power consumption
-    # A site_pdus array with information about whether a given pdu has per_outlets measurements
-    # a site_pdu_outlets array with information about the number of nodes connected ot a given pdu outlet
-    def monitoring_wattmeter_annotation(pdu_info, site_pdus, site_pdu_outlets,site)
-      per_outlet=true
-      pdu_info.each do |a_pdu_info|
-        measure_name=measurement_point_name(a_pdu_info,site)
-        if site_pdu_outlets[measure_name] && site_pdu_outlets[measure_name] > 1
-          per_outlet=false #at least two nodes are pointing to the same measurement point 
-        else
-          per_outlet=per_outlet && site_pdus[a_pdu_info[:uid]] rescue nil
-        end
-      end
-      if per_outlet.nil?
-        node_monitoring_wattmeter=:false
-      elsif pdu_info.size > 1
-        if per_outlet
-          node_monitoring_wattmeter=:multiple
-        else
-          node_monitoring_wattmeter=:multiple_shared
-        end
-      else
-        if per_outlet
-          node_monitoring_wattmeter=:true
-        else
-          node_monitoring_wattmeter=:shared
-        end
-      end
-      node_monitoring_wattmeter
-    end
-
-    # Attempts to add information to @data to help users
-    def annotate
-      @data[:sites].each do |site|
-        site_pdus={}
-        site_pdu_outlets={}
-        metric_nodes={}
-        node_monitoring_wattmeter={}
-        if site[:clusters].nil?
-          return
-        end
-        unless site[:pdus].nil?
-          site[:pdus].each do |pdu|
-            site_pdus[pdu[:uid]]=pdu[:sensors][0][:power][:per_outlets] rescue nil
-            pp pdu if site_pdus[pdu[:uid]].nil?
-          end
-          site[:clusters].each do |cluster|
-            cluster[:nodes].each do |node|
-              pdu_info=node[:sensors][:power][:via][:pdu] rescue nil
-              unless pdu_info.nil?
-                if pdu_info.size > 0 
-                  if pdu_info.first.is_a?(Array)
-                    pdu_info.each do |a_pdu_info|
-                      count_measurement_points(a_pdu_info,site_pdu_outlets,site)
-                    end
-                  else
-                    count_measurement_points(pdu_info,site_pdu_outlets,site)
-                  end
-                end
-              end
-            end
-          end
-          site[:clusters].each do |cluster|
-            cluster[:nodes].each do |node|
-              node_monitoring_wattmeter[node[:uid]]=:false
-              pdu_info=node[:sensors][:power][:via][:pdu] rescue nil
-              unless pdu_info.nil?
-                # pdu_info is either
-                # [{:uid=>"parapluie-pdu-4", :port=>2}] in the simple case
-                # [{:uid=>"graphene-pdu9", :port=>23}, {:uid=>"graphene-pdu9", :port=>24}] when plugged to 2 outlets
-                # [[{:uid=>"adonis-pdu-1", :port=>"outlet-11"},{:uid=>"adonis-pdu-1", :port=>"outlet-12"}],
-                #  [{:measure=>"block-1", :uid=>"adonis-pdu-1"}]]
-                raise ArgumentError, "Node #{node[:uid]}[:sensors][:power][:via][:pdu] should be an Array" unless pdu_info.is_a?(Array)
-                if pdu_info.size > 0 
-                  if pdu_info.first.is_a?(Array)
-                    # multiple measurement options : advertise the best
-                    priority={
-                      :true => 5,
-                      :multiple => 4,
-                      :shared => 3,
-                      :multiple_shared => 2,
-                      :false => 1,
-                    }
-                    node_monitoring_wattmeter[node[:uid]]=:false
-                    pdu_info.each do |a_pdu_info|
-                      local_monitoring_wattmeter=monitoring_wattmeter_annotation(a_pdu_info,site_pdus,site_pdu_outlets,site)
-                      if priority[local_monitoring_wattmeter] > priority[node_monitoring_wattmeter[node[:uid]]]
-                        node_monitoring_wattmeter[node[:uid]]=local_monitoring_wattmeter
-                      end
-                    end
-                  else 
-                    node_monitoring_wattmeter[node[:uid]]=monitoring_wattmeter_annotation(pdu_info,site_pdus,site_pdu_outlets,site)
-                  end
-                end               
-              else
-                ipmi_info=node[:sensors][:power][:via][:ipmi] rescue nil
-                unless ipmi_info.nil?
-                  node_monitoring_wattmeter[node[:uid]]=:outofband
-                end
-              end
-            end
-          end
-        end
-        site[:clusters].each do |cluster|
-          cluster[:nodes].each do |node|
-            node_monitoring_wattmeter[node[:uid]]=:false unless node_monitoring_wattmeter.has_key?(node[:uid])
-            if node.has_key?(:monitoring)
-              if node[:monitoring].has_key?(:wattmeter)
-                if node[:monitoring][:wattmeter] != node_monitoring_wattmeter[node[:uid]]
-                  puts "#{node[:uid]}[:monitoring][:wattmeter] override calculated information with information found in input. Calculated it should be #{node_monitoring_wattmeter[node[:uid]]}, keeping #{node[:monitoring][:wattmeter]}"
-                end
-              else #create wattmeter entry
-                node[:monitoring][:wattmeter]= node_monitoring_wattmeter[node[:uid]]
-              end
-            else #create monitoring entry
-              node[:monitoring]={:wattmeter => node_monitoring_wattmeter[node[:uid]]}
-            end
-            #puts "#{node[:uid]}[:monitoring][:wattmeter] = #{node[:monitoring][:wattmeter]}"
-          end
-        end
-      end
-    end
-
-    def write(repository, options = {:simulate => false})
-      things_to_create = []
-      @data.write("/") do |thing_to_create|
-        things_to_create << thing_to_create if thing_to_create.valid?
-      end
-      groups = things_to_create.group_by{|thing| thing.class}
-      groups.has_key?(G5K::Folder) and groups[G5K::Folder].each do |folder|
-        full_path = File.join(repository, folder.path)
-        unless File.exists?(full_path)
-          puts "Directory to be written = \t#{full_path}"
-          FileUtils.mkdir_p(full_path) unless options[:simulate]
-        end
-      end
-      groups.has_key?(G5K::Tree) and groups[G5K::Tree].each do |file|
-        full_path = File.join(repository, file.path)
-        new_content = JSON.pretty_generate(file.contents)
-        existing_content = File.exists?(full_path) ? File.open(full_path, "r").read : ""
-        if new_content.hash != existing_content.hash
-          unless file.has_key? :discard_content and file[:discard_content]
-            puts "File to be written      = \t#{full_path}"
-            File.open(full_path, "w+"){ |f| f << new_content  } unless options[:simulate]
-          end
-        end
-      end
-      groups.has_key?(G5K::Link) and groups[G5K::Link].each do |link|      
-        FileUtils.cd(repository) do |dir|
-          to = File.join(".", link.path)
-          from = File.join([".."]*(to.count(File::SEPARATOR)-1), "#{link.from}.json")
-          unless File.exists?(to)
-            puts "Symbolic link to be written = \t#{to} -> #{from}"
-            FileUtils.ln_s(from, to, :force => true) unless options[:simulate]
-          end
-        end
-      end  
-    end
-  
-  end
-end
diff --git a/generators/lib/grid5000.rb b/generators/lib/grid5000.rb
deleted file mode 100644
index e3d9dd7ec5..0000000000
--- a/generators/lib/grid5000.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'grid5000/cluster'
-require 'grid5000/node'
-
-module Grid5000
-  class Error < StandardError; end
-  class MissingProperty < Grid5000::Error; end
-end
diff --git a/generators/lib/grid5000/cluster.rb b/generators/lib/grid5000/cluster.rb
deleted file mode 100644
index 778f0d34de..0000000000
--- a/generators/lib/grid5000/cluster.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Grid5000
-  class Cluster
-    attr_reader :properties
-    
-    def initialize(properties)
-      @properties = properties
-    end
-    
-  end
-
-end
\ No newline at end of file
diff --git a/generators/lib/grid5000/node.rb b/generators/lib/grid5000/node.rb
deleted file mode 100644
index 967317ffe9..0000000000
--- a/generators/lib/grid5000/node.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-module Grid5000
-  class Node
-    MiB = 1024**2
-    
-    attr_reader :properties, :cluster
-    
-    MAPPINGS = {
-      "oar-2.4" => Proc.new{ |cluster, properties|
-        # see https://www.grid5000.fr/mediawiki/index.php/OAR2_properties for list of properties
-        h = {}
-        main_network_adapter = properties["network_adapters"].find{|na|
-          na['enabled'] && 
-          na['mounted'] && 
-          na['interface'] =~ /ethernet/i && 
-          !na['management']
-        }
-        h['host']            = main_network_adapter['network_address']
-        raise MissingProperty, "Node has no network_address" unless h['host']
-        h['ip']              = main_network_adapter['ip']
-        raise MissingProperty, "Node has no IP" unless h['ip']
-        h['cluster']         = cluster.properties['uid']
-        h['nodemodel']       = cluster.properties['model']
-        h['switch']          = main_network_adapter['switch']
-        h['besteffort']      = properties['supported_job_types']['besteffort'] ? "YES" : "NO"
-        h['deploy']          = properties['supported_job_types']['deploy'] ? "YES" : "NO"
-        h['ip_virtual']      = properties['supported_job_types']['virtual'] ? "YES" : "NO"
-        h['virtual']         = properties['supported_job_types']['virtual']
-        h['cpuarch']         = properties['architecture']['platform_type']
-        h['cpucore']         = properties['architecture']['smt_size']/properties['architecture']['smp_size']
-        h['cputype']         = [properties['processor']['model'], properties['processor']['version']].join(" ")
-        h['cpufreq']         = properties['processor']['clock_speed']/1_000_000_000.0
-        h['disktype']        = (properties['storage_devices'].first || {})['interface']
-        h['ethnb']           = properties["network_adapters"].select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mountable'] == true}.length
-        eth10g               = properties['network_adapters'].select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mountable'] == true}
-        h['eth10g']          = eth10g.detect{|na| na['rate'] == 10_000_000_000}.nil? ? "NO" : "YES"
-        ib10g                = properties['network_adapters'].detect{|na| na['interface'] =~ /infiniband/i && na['rate'] == 10_000_000_000}
-        h['ib10g']           = ib10g.nil? ? "NO" : "YES"
-        h['ib10gmodel']      = ib10g.nil? ? "none" : ib10g['version']
-        ib20g                = properties['network_adapters'].detect{|na| na['interface'] =~ /infiniband/i && na['rate'] == 20_000_000_000}
-        h['ib20g']           = ib20g.nil? ? "NO" : "YES"
-        h['ib20gmodel']      = ib20g.nil? ? "none" : ib20g['version']
-        ib40g                = properties['network_adapters'].detect{|na| na['interface'] =~ /infiniband/i && na['rate'] == 40_000_000_000}
-        h['ib40g']           = ib40g.nil? ? "NO" : "YES"
-        h['ib40gmodel']      = ib40g.nil? ? "none" : ib40g['version']
-        ib56g                = properties['network_adapters'].detect{|na| na['interface'] =~ /infiniband/i && na['rate'] == 56_000_000_000}
-        h['ib56g']           = ib56g.nil? ? "NO" : "YES"
-        h['ib56gmodel']      = ib56g.nil? ? "none" : ib56g['version']
-        myri10g              = properties['network_adapters'].detect{|na| na['interface'] =~ /myri/i && na['rate'] == 10_000_000_000}
-        h['myri10g']         = myri10g.nil? ? "NO" : "YES"
-        h['myri10gmodel']    = myri10g.nil? ? "none" : myri10g['version']
-        myri2g               = properties['network_adapters'].detect{|na| na['interface'] =~ /myri/i && na['rate'] == 2_000_000_000}
-        h['myri2g']          = myri2g.nil? ? "NO" : "YES"
-        h['myri2gmodel']     = myri2g.nil? ? "none" : myri2g['version']
-        h['memcore']         = properties['main_memory']['ram_size']/properties['architecture']['smt_size']/MiB
-        h['memcpu']          = properties['main_memory']['ram_size']/properties['architecture']['smp_size']/MiB
-        h['memnode']         = properties['main_memory']['ram_size']/MiB
-        properties["gpu"]  ||= {}
-        h['gpu']             = (properties['gpu']['gpu'].is_a?(String) and properties['gpu']['gpu'].upcase == "SHARED") ? "SHARED" \
-                                : properties['gpu']['gpu'] ? "YES" : "NO"
-        h['gpu_count']       = properties['gpu']['gpu_count']
-        h['gpu_model']       = properties['gpu']['gpu_model']
-        properties["monitoring"] ||= {}
-        h['wattmeter']       = !["true","false"].include?(properties['monitoring']['wattmeter']) ? properties['monitoring']['wattmeter'].upcase \
-                                : properties['monitoring']['wattmeter']=="true" ? "YES" : "NO"
-        h['rconsole']        = properties['monitoring']['rconsole'] == false ? "NO" : "YES"
-        h['cluster_priority'] = cluster.properties['priority'] || Time.httpdate(cluster.properties['created_at']).strftime("%Y%m")
-        begin
-          h['production'] = properties['supported_job_types']['queues'].include?("production") ? "YES" : "NO"
-        rescue
-          # Set as NO by default
-          h['production'] = "NO"
-        end
-        h['max_walltime'] = properties['supported_job_types']['max_walltime'] || 0
-        h
-      }
-    }
-    
-    def initialize(cluster, properties)
-      @cluster = cluster
-      @properties = properties
-    end
-    
-    def export(destination = "oar-2.4")
-      if MAPPINGS.has_key?(destination)
-        MAPPINGS[destination].call(cluster, properties)
-      else
-        raise ArgumentError, "Unsupported destination for export: #{destination.inspect}"
-      end
-    end
-  end
-
-end
diff --git a/generators/lib/grid5000/pdu.rb b/generators/lib/grid5000/pdu.rb
deleted file mode 100644
index 06773c8cbc..0000000000
--- a/generators/lib/grid5000/pdu.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Grid5000
-  class Pdu
-    attr_reader :properties
-
-    def initialize(properties)
-      @properties = properties
-    end
-
-  end
-
-end
-- 
GitLab