From eaa424480ab274fc536e13b23fcfbaf2a93dfad2 Mon Sep 17 00:00:00 2001
From: Samir Noir <samir.noir@inria.fr>
Date: Tue, 9 Feb 2021 17:48:54 +0100
Subject: [PATCH] [all] Add disks storage type (SSD or HDD) in input files

---
 .../sites/grenoble/clusters/dahu/dahu.yaml    |  3 --
 .../grenoble/clusters/dahu/nodes/dahu-1.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-10.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-11.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-12.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-13.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-14.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-15.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-16.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-17.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-18.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-19.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-2.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-20.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-21.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-22.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-23.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-24.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-25.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-26.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-27.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-28.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-29.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-3.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-30.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-31.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-32.yaml |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-4.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-5.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-6.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-7.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-8.yaml  |  3 ++
 .../grenoble/clusters/dahu/nodes/dahu-9.yaml  |  3 ++
 .../sites/grenoble/clusters/drac/drac.yaml    |  2 -
 .../grenoble/clusters/drac/nodes/drac-1.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-10.yaml |  2 +
 .../grenoble/clusters/drac/nodes/drac-11.yaml |  2 +
 .../grenoble/clusters/drac/nodes/drac-12.yaml |  2 +
 .../grenoble/clusters/drac/nodes/drac-2.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-3.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-4.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-5.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-6.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-7.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-8.yaml  |  2 +
 .../grenoble/clusters/drac/nodes/drac-9.yaml  |  2 +
 .../clusters/troll/nodes/troll-1.yaml         |  2 +
 .../clusters/troll/nodes/troll-2.yaml         |  2 +
 .../clusters/troll/nodes/troll-3.yaml         |  2 +
 .../clusters/troll/nodes/troll-4.yaml         |  2 +
 .../sites/grenoble/clusters/troll/troll.yaml  |  2 -
 .../grenoble/clusters/yeti/nodes/yeti-1.yaml  |  5 +++
 .../grenoble/clusters/yeti/nodes/yeti-2.yaml  |  5 +++
 .../grenoble/clusters/yeti/nodes/yeti-3.yaml  |  5 +++
 .../grenoble/clusters/yeti/nodes/yeti-4.yaml  |  5 +++
 .../sites/grenoble/clusters/yeti/yeti.yaml    |  5 ---
 .../sites/lille/clusters/chetemi/chetemi.yaml |  2 -
 .../clusters/chetemi/nodes/chetemi-1.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-10.yaml    |  2 +
 .../clusters/chetemi/nodes/chetemi-11.yaml    |  2 +
 .../clusters/chetemi/nodes/chetemi-12.yaml    |  2 +
 .../clusters/chetemi/nodes/chetemi-13.yaml    |  2 +
 .../clusters/chetemi/nodes/chetemi-14.yaml    |  2 +
 .../clusters/chetemi/nodes/chetemi-15.yaml    |  2 +
 .../clusters/chetemi/nodes/chetemi-2.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-3.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-4.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-5.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-6.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-7.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-8.yaml     |  2 +
 .../clusters/chetemi/nodes/chetemi-9.yaml     |  2 +
 .../sites/lille/clusters/chiclet/chiclet.yaml |  3 --
 .../clusters/chiclet/nodes/chiclet-1.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-2.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-3.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-4.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-5.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-6.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-7.yaml     |  3 ++
 .../clusters/chiclet/nodes/chiclet-8.yaml     |  3 ++
 .../lille/clusters/chifflet/chifflet.yaml     |  4 --
 .../clusters/chifflet/nodes/chifflet-1.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-2.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-3.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-4.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-5.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-6.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-7.yaml   |  4 ++
 .../clusters/chifflet/nodes/chifflet-8.yaml   |  4 ++
 .../lille/clusters/chifflot/chifflot.yaml     |  6 ---
 .../clusters/chifflot/nodes/chifflot-1.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-2.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-3.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-4.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-5.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-6.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-7.yaml   |  6 +++
 .../clusters/chifflot/nodes/chifflot-8.yaml   |  6 +++
 .../petitprince/nodes/petitprince-1.yaml      |  1 +
 .../petitprince/nodes/petitprince-10.yaml     |  1 +
 .../petitprince/nodes/petitprince-11.yaml     |  1 +
 .../petitprince/nodes/petitprince-13.yaml     |  1 +
 .../petitprince/nodes/petitprince-14.yaml     |  1 +
 .../petitprince/nodes/petitprince-15.yaml     |  1 +
 .../petitprince/nodes/petitprince-16.yaml     |  1 +
 .../petitprince/nodes/petitprince-2.yaml      |  1 +
 .../petitprince/nodes/petitprince-3.yaml      |  1 +
 .../petitprince/nodes/petitprince-4.yaml      |  1 +
 .../petitprince/nodes/petitprince-5.yaml      |  1 +
 .../petitprince/nodes/petitprince-6.yaml      |  1 +
 .../petitprince/nodes/petitprince-7.yaml      |  1 +
 .../petitprince/nodes/petitprince-8.yaml      |  1 +
 .../petitprince/nodes/petitprince-9.yaml      |  1 +
 .../clusters/petitprince/petitprince.yaml     |  1 -
 .../sites/lyon/clusters/gemini/gemini.yaml    |  5 ---
 .../lyon/clusters/gemini/nodes/gemini-1.yaml  |  5 +++
 .../lyon/clusters/gemini/nodes/gemini-2.yaml  |  5 +++
 .../sites/lyon/clusters/hercule/hercule.yaml  |  3 --
 .../clusters/hercule/nodes/hercule-1.yaml     |  3 ++
 .../clusters/hercule/nodes/hercule-2.yaml     |  3 ++
 .../clusters/hercule/nodes/hercule-3.yaml     |  3 ++
 .../clusters/hercule/nodes/hercule-4.yaml     |  3 ++
 .../lyon/clusters/nova/nodes/nova-1.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-10.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-11.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-12.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-13.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-14.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-15.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-16.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-17.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-18.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-19.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-2.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-20.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-21.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-22.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-23.yaml     |  1 +
 .../lyon/clusters/nova/nodes/nova-3.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-4.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-5.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-6.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-7.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-8.yaml      |  1 +
 .../lyon/clusters/nova/nodes/nova-9.yaml      |  1 +
 .../sites/lyon/clusters/nova/nova.yaml        |  1 -
 .../lyon/clusters/orion/nodes/orion-1.yaml    |  1 +
 .../lyon/clusters/orion/nodes/orion-2.yaml    |  1 +
 .../lyon/clusters/orion/nodes/orion-3.yaml    |  1 +
 .../lyon/clusters/orion/nodes/orion-4.yaml    |  1 +
 .../sites/lyon/clusters/orion/orion.yaml      |  1 -
 .../lyon/clusters/pyxis/nodes/pyxis-1.yaml    |  2 +
 .../lyon/clusters/pyxis/nodes/pyxis-2.yaml    |  2 +
 .../lyon/clusters/pyxis/nodes/pyxis-3.yaml    |  2 +
 .../lyon/clusters/pyxis/nodes/pyxis-4.yaml    |  2 +
 .../sites/lyon/clusters/pyxis/pyxis.yaml      |  2 -
 .../sagittaire/nodes/sagittaire-11.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-12.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-13.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-14.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-15.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-16.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-17.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-18.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-19.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-2.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-20.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-24.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-27.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-29.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-3.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-30.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-31.yaml       |  1 +
 .../sagittaire/nodes/sagittaire-4.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-5.yaml        |  1 +
 .../sagittaire/nodes/sagittaire-6.yaml        |  1 +
 .../lyon/clusters/sagittaire/sagittaire.yaml  |  2 -
 .../lyon/clusters/taurus/nodes/taurus-1.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-10.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-11.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-12.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-13.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-15.yaml |  1 +
 .../lyon/clusters/taurus/nodes/taurus-2.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-3.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-4.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-5.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-6.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-7.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-8.yaml  |  1 +
 .../lyon/clusters/taurus/nodes/taurus-9.yaml  |  1 +
 .../sites/lyon/clusters/taurus/taurus.yaml    |  1 -
 .../nancy/clusters/graffiti/graffiti.yaml     |  1 -
 .../clusters/graffiti/nodes/graffiti-1.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-10.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-11.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-12.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-13.yaml  |  1 +
 .../clusters/graffiti/nodes/graffiti-2.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-3.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-4.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-5.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-6.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-7.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-8.yaml   |  1 +
 .../clusters/graffiti/nodes/graffiti-9.yaml   |  1 +
 .../nancy/clusters/graoully/graoully.yaml     |  2 -
 .../clusters/graoully/nodes/graoully-1.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-10.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-11.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-12.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-13.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-14.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-15.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-16.yaml  |  2 +
 .../clusters/graoully/nodes/graoully-2.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-3.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-4.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-5.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-6.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-7.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-8.yaml   |  2 +
 .../clusters/graoully/nodes/graoully-9.yaml   |  2 +
 .../nancy/clusters/graphique/graphique.yaml   |  1 -
 .../clusters/graphique/nodes/graphique-1.yaml |  1 +
 .../clusters/graphique/nodes/graphique-2.yaml |  1 +
 .../clusters/graphique/nodes/graphique-3.yaml |  1 +
 .../clusters/graphique/nodes/graphique-4.yaml |  1 +
 .../clusters/graphique/nodes/graphique-5.yaml |  1 +
 .../clusters/graphique/nodes/graphique-6.yaml |  1 +
 .../nancy/clusters/graphite/graphite.yaml     |  2 -
 .../clusters/graphite/nodes/graphite-1.yaml   |  2 +
 .../clusters/graphite/nodes/graphite-2.yaml   |  2 +
 .../clusters/graphite/nodes/graphite-3.yaml   |  2 +
 .../clusters/graphite/nodes/graphite-4.yaml   |  2 +
 .../sites/nancy/clusters/grappe/grappe.yaml   |  2 -
 .../nancy/clusters/grappe/nodes/grappe-1.yaml |  2 +
 .../clusters/grappe/nodes/grappe-10.yaml      |  2 +
 .../clusters/grappe/nodes/grappe-11.yaml      |  2 +
 .../clusters/grappe/nodes/grappe-12.yaml      |  2 +
 .../clusters/grappe/nodes/grappe-13.yaml      |  2 +
 .../clusters/grappe/nodes/grappe-14.yaml      |  2 +
 .../clusters/grappe/nodes/grappe-15.yaml      |  2 +
 .../clusters/grappe/nodes/grappe-16.yaml      |  2 +
 .../nancy/clusters/grappe/nodes/grappe-2.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-3.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-4.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-5.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-6.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-7.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-8.yaml |  2 +
 .../nancy/clusters/grappe/nodes/grappe-9.yaml |  2 +
 .../sites/nancy/clusters/grcinq/grcinq.yaml   |  1 -
 .../nancy/clusters/grcinq/nodes/grcinq-1.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-10.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-11.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-12.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-13.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-14.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-15.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-16.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-17.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-18.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-19.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-2.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-20.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-21.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-22.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-23.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-24.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-25.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-26.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-27.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-28.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-29.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-3.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-30.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-31.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-32.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-33.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-34.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-35.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-36.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-37.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-38.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-39.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-4.yaml |  1 +
 .../clusters/grcinq/nodes/grcinq-40.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-41.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-42.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-43.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-44.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-45.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-46.yaml      |  1 +
 .../clusters/grcinq/nodes/grcinq-47.yaml      |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-5.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-6.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-7.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-8.yaml |  1 +
 .../nancy/clusters/grcinq/nodes/grcinq-9.yaml |  1 +
 .../sites/nancy/clusters/grele/grele.yaml     |  2 -
 .../nancy/clusters/grele/nodes/grele-1.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-10.yaml  |  2 +
 .../nancy/clusters/grele/nodes/grele-11.yaml  |  2 +
 .../nancy/clusters/grele/nodes/grele-12.yaml  |  2 +
 .../nancy/clusters/grele/nodes/grele-13.yaml  |  2 +
 .../nancy/clusters/grele/nodes/grele-14.yaml  |  2 +
 .../nancy/clusters/grele/nodes/grele-2.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-3.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-4.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-5.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-6.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-7.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-8.yaml   |  2 +
 .../nancy/clusters/grele/nodes/grele-9.yaml   |  2 +
 .../sites/nancy/clusters/grimani/grimani.yaml |  1 -
 .../clusters/grimani/nodes/grimani-1.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-2.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-3.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-4.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-5.yaml     |  1 +
 .../clusters/grimani/nodes/grimani-6.yaml     |  1 +
 .../nancy/clusters/grimoire/grimoire.yaml     |  6 ---
 .../clusters/grimoire/nodes/grimoire-1.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-2.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-3.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-4.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-5.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-6.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-7.yaml   |  6 +++
 .../clusters/grimoire/nodes/grimoire-8.yaml   |  6 +++
 .../sites/nancy/clusters/grisou/grisou.yaml   |  2 -
 .../nancy/clusters/grisou/nodes/grisou-1.yaml |  2 +
 .../clusters/grisou/nodes/grisou-10.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-11.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-12.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-13.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-14.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-15.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-16.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-17.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-18.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-19.yaml      |  2 +
 .../nancy/clusters/grisou/nodes/grisou-2.yaml |  2 +
 .../clusters/grisou/nodes/grisou-20.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-21.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-22.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-23.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-24.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-25.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-26.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-27.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-28.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-29.yaml      |  2 +
 .../nancy/clusters/grisou/nodes/grisou-3.yaml |  2 +
 .../clusters/grisou/nodes/grisou-30.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-31.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-32.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-33.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-34.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-35.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-36.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-37.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-38.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-39.yaml      |  2 +
 .../nancy/clusters/grisou/nodes/grisou-4.yaml |  2 +
 .../clusters/grisou/nodes/grisou-40.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-41.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-42.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-43.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-44.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-45.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-46.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-47.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-48.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-49.yaml      |  2 +
 .../nancy/clusters/grisou/nodes/grisou-5.yaml |  2 +
 .../clusters/grisou/nodes/grisou-50.yaml      |  2 +
 .../clusters/grisou/nodes/grisou-51.yaml      |  2 +
 .../nancy/clusters/grisou/nodes/grisou-6.yaml |  2 +
 .../nancy/clusters/grisou/nodes/grisou-7.yaml |  2 +
 .../nancy/clusters/grisou/nodes/grisou-8.yaml |  2 +
 .../nancy/clusters/grisou/nodes/grisou-9.yaml |  2 +
 .../sites/nancy/clusters/gros/gros.yaml       |  2 -
 .../nancy/clusters/gros/nodes/gros-1.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-10.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-100.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-101.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-102.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-103.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-104.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-105.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-106.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-107.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-108.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-109.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-11.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-110.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-111.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-112.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-113.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-114.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-115.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-116.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-117.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-118.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-119.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-12.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-120.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-121.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-122.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-123.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-124.yaml   |  2 +
 .../nancy/clusters/gros/nodes/gros-13.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-14.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-15.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-16.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-17.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-18.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-19.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-2.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-20.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-21.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-22.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-23.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-24.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-25.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-26.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-27.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-28.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-29.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-3.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-30.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-31.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-32.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-33.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-34.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-35.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-36.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-37.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-38.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-39.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-4.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-40.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-41.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-42.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-43.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-44.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-45.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-46.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-47.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-48.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-49.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-5.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-50.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-51.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-52.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-53.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-54.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-55.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-56.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-57.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-58.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-59.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-6.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-60.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-61.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-62.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-63.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-64.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-65.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-66.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-67.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-68.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-69.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-7.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-70.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-71.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-72.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-73.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-74.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-75.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-76.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-77.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-78.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-79.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-8.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-80.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-81.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-82.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-83.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-84.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-85.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-86.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-87.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-88.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-89.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-9.yaml     |  2 +
 .../nancy/clusters/gros/nodes/gros-90.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-91.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-92.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-93.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-94.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-95.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-96.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-97.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-98.yaml    |  2 +
 .../nancy/clusters/gros/nodes/gros-99.yaml    |  2 +
 .../nancy/clusters/grouille/grouille.yaml     |  2 -
 .../clusters/grouille/nodes/grouille-1.yaml   |  2 +
 .../clusters/grouille/nodes/grouille-2.yaml   |  2 +
 .../sites/nancy/clusters/grue/grue.yaml       |  1 -
 .../nancy/clusters/grue/nodes/grue-1.yaml     |  1 +
 .../nancy/clusters/grue/nodes/grue-2.yaml     |  1 +
 .../nancy/clusters/grue/nodes/grue-3.yaml     |  1 +
 .../nancy/clusters/grue/nodes/grue-4.yaml     |  1 +
 .../nancy/clusters/grue/nodes/grue-5.yaml     |  1 +
 .../sites/nancy/clusters/grvingt/grvingt.yaml |  1 -
 .../clusters/grvingt/nodes/grvingt-1.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-10.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-11.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-12.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-13.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-14.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-15.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-16.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-17.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-18.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-19.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-2.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-20.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-21.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-22.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-23.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-24.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-25.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-26.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-27.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-28.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-29.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-3.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-30.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-31.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-32.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-33.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-34.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-35.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-36.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-37.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-38.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-39.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-4.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-40.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-41.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-42.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-43.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-44.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-45.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-46.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-47.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-48.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-49.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-5.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-50.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-51.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-52.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-53.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-54.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-55.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-56.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-57.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-58.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-59.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-6.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-60.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-61.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-62.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-63.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-64.yaml    |  1 +
 .../clusters/grvingt/nodes/grvingt-7.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-8.yaml     |  1 +
 .../clusters/grvingt/nodes/grvingt-9.yaml     |  1 +
 .../nantes/clusters/econome/econome.yaml      |  1 -
 .../clusters/econome/nodes/econome-1.yaml     |  1 +
 .../clusters/econome/nodes/econome-10.yaml    |  1 +
 .../clusters/econome/nodes/econome-11.yaml    |  1 +
 .../clusters/econome/nodes/econome-12.yaml    |  1 +
 .../clusters/econome/nodes/econome-13.yaml    |  1 +
 .../clusters/econome/nodes/econome-14.yaml    |  1 +
 .../clusters/econome/nodes/econome-15.yaml    |  1 +
 .../clusters/econome/nodes/econome-16.yaml    |  1 +
 .../clusters/econome/nodes/econome-17.yaml    |  1 +
 .../clusters/econome/nodes/econome-18.yaml    |  1 +
 .../clusters/econome/nodes/econome-19.yaml    |  1 +
 .../clusters/econome/nodes/econome-2.yaml     |  1 +
 .../clusters/econome/nodes/econome-20.yaml    |  1 +
 .../clusters/econome/nodes/econome-21.yaml    |  1 +
 .../clusters/econome/nodes/econome-22.yaml    |  1 +
 .../clusters/econome/nodes/econome-3.yaml     |  1 +
 .../clusters/econome/nodes/econome-4.yaml     |  1 +
 .../clusters/econome/nodes/econome-5.yaml     |  1 +
 .../clusters/econome/nodes/econome-6.yaml     |  1 +
 .../clusters/econome/nodes/econome-7.yaml     |  1 +
 .../clusters/econome/nodes/econome-8.yaml     |  1 +
 .../clusters/econome/nodes/econome-9.yaml     |  1 +
 .../nantes/clusters/ecotype/ecotype.yaml      |  1 -
 .../clusters/ecotype/nodes/ecotype-1.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-10.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-11.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-12.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-13.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-14.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-15.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-16.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-17.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-18.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-19.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-2.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-20.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-21.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-22.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-23.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-24.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-25.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-26.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-27.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-28.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-29.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-3.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-30.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-31.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-32.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-33.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-34.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-35.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-36.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-37.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-38.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-39.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-4.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-40.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-41.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-42.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-43.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-44.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-45.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-46.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-47.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-48.yaml    |  1 +
 .../clusters/ecotype/nodes/ecotype-5.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-6.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-7.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-8.yaml     |  1 +
 .../clusters/ecotype/nodes/ecotype-9.yaml     |  1 +
 .../clusters/paranoia/nodes/paranoia-1.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-2.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-3.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-4.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-5.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-6.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-7.yaml   |  5 +++
 .../clusters/paranoia/nodes/paranoia-8.yaml   |  5 +++
 .../rennes/clusters/paranoia/paranoia.yaml    |  5 ---
 .../clusters/parapide/nodes/parapide-1.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-10.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-12.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-13.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-16.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-18.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-19.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-2.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-21.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-24.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-25.yaml  |  1 +
 .../clusters/parapide/nodes/parapide-3.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-5.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-6.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-7.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-8.yaml   |  1 +
 .../clusters/parapide/nodes/parapide-9.yaml   |  1 +
 .../rennes/clusters/parapide/parapide.yaml    |  1 -
 .../clusters/parapluie/nodes/parapluie-1.yaml |  1 +
 .../parapluie/nodes/parapluie-11.yaml         |  1 +
 .../parapluie/nodes/parapluie-12.yaml         |  1 +
 .../parapluie/nodes/parapluie-15.yaml         |  1 +
 .../parapluie/nodes/parapluie-19.yaml         |  1 +
 .../clusters/parapluie/nodes/parapluie-2.yaml |  1 +
 .../parapluie/nodes/parapluie-20.yaml         |  1 +
 .../parapluie/nodes/parapluie-21.yaml         |  1 +
 .../parapluie/nodes/parapluie-22.yaml         |  1 +
 .../parapluie/nodes/parapluie-25.yaml         |  1 +
 .../parapluie/nodes/parapluie-28.yaml         |  1 +
 .../parapluie/nodes/parapluie-31.yaml         |  1 +
 .../parapluie/nodes/parapluie-32.yaml         |  1 +
 .../parapluie/nodes/parapluie-35.yaml         |  1 +
 .../parapluie/nodes/parapluie-38.yaml         |  1 +
 .../clusters/parapluie/nodes/parapluie-9.yaml |  1 +
 .../rennes/clusters/parapluie/parapluie.yaml  |  1 -
 .../clusters/parasilo/nodes/parasilo-1.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-10.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-11.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-12.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-13.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-14.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-15.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-16.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-17.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-18.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-19.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-2.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-20.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-21.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-22.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-23.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-24.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-25.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-26.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-27.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-28.yaml  |  6 +++
 .../clusters/parasilo/nodes/parasilo-3.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-4.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-5.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-6.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-7.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-8.yaml   |  6 +++
 .../clusters/parasilo/nodes/parasilo-9.yaml   |  6 +++
 .../rennes/clusters/parasilo/parasilo.yaml    |  6 ---
 .../clusters/paravance/nodes/paravance-1.yaml |  2 +
 .../paravance/nodes/paravance-10.yaml         |  2 +
 .../paravance/nodes/paravance-11.yaml         |  2 +
 .../paravance/nodes/paravance-12.yaml         |  2 +
 .../paravance/nodes/paravance-13.yaml         |  2 +
 .../paravance/nodes/paravance-14.yaml         |  2 +
 .../paravance/nodes/paravance-15.yaml         |  2 +
 .../paravance/nodes/paravance-16.yaml         |  2 +
 .../paravance/nodes/paravance-17.yaml         |  2 +
 .../paravance/nodes/paravance-18.yaml         |  2 +
 .../paravance/nodes/paravance-19.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-2.yaml |  2 +
 .../paravance/nodes/paravance-20.yaml         |  2 +
 .../paravance/nodes/paravance-21.yaml         |  2 +
 .../paravance/nodes/paravance-22.yaml         |  2 +
 .../paravance/nodes/paravance-23.yaml         |  2 +
 .../paravance/nodes/paravance-24.yaml         |  2 +
 .../paravance/nodes/paravance-25.yaml         |  2 +
 .../paravance/nodes/paravance-26.yaml         |  2 +
 .../paravance/nodes/paravance-27.yaml         |  2 +
 .../paravance/nodes/paravance-28.yaml         |  2 +
 .../paravance/nodes/paravance-29.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-3.yaml |  2 +
 .../paravance/nodes/paravance-30.yaml         |  2 +
 .../paravance/nodes/paravance-31.yaml         |  2 +
 .../paravance/nodes/paravance-32.yaml         |  2 +
 .../paravance/nodes/paravance-33.yaml         |  2 +
 .../paravance/nodes/paravance-34.yaml         |  2 +
 .../paravance/nodes/paravance-35.yaml         |  2 +
 .../paravance/nodes/paravance-36.yaml         |  2 +
 .../paravance/nodes/paravance-37.yaml         |  2 +
 .../paravance/nodes/paravance-38.yaml         |  2 +
 .../paravance/nodes/paravance-39.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-4.yaml |  2 +
 .../paravance/nodes/paravance-40.yaml         |  2 +
 .../paravance/nodes/paravance-41.yaml         |  2 +
 .../paravance/nodes/paravance-42.yaml         |  2 +
 .../paravance/nodes/paravance-43.yaml         |  2 +
 .../paravance/nodes/paravance-44.yaml         |  2 +
 .../paravance/nodes/paravance-45.yaml         |  2 +
 .../paravance/nodes/paravance-46.yaml         |  2 +
 .../paravance/nodes/paravance-47.yaml         |  2 +
 .../paravance/nodes/paravance-48.yaml         |  2 +
 .../paravance/nodes/paravance-49.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-5.yaml |  2 +
 .../paravance/nodes/paravance-50.yaml         |  2 +
 .../paravance/nodes/paravance-51.yaml         |  2 +
 .../paravance/nodes/paravance-52.yaml         |  2 +
 .../paravance/nodes/paravance-53.yaml         |  2 +
 .../paravance/nodes/paravance-54.yaml         |  2 +
 .../paravance/nodes/paravance-55.yaml         |  2 +
 .../paravance/nodes/paravance-56.yaml         |  2 +
 .../paravance/nodes/paravance-57.yaml         |  2 +
 .../paravance/nodes/paravance-58.yaml         |  2 +
 .../paravance/nodes/paravance-59.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-6.yaml |  2 +
 .../paravance/nodes/paravance-60.yaml         |  2 +
 .../paravance/nodes/paravance-61.yaml         |  2 +
 .../paravance/nodes/paravance-62.yaml         |  2 +
 .../paravance/nodes/paravance-63.yaml         |  2 +
 .../paravance/nodes/paravance-64.yaml         |  2 +
 .../paravance/nodes/paravance-65.yaml         |  2 +
 .../paravance/nodes/paravance-66.yaml         |  2 +
 .../paravance/nodes/paravance-67.yaml         |  2 +
 .../paravance/nodes/paravance-68.yaml         |  2 +
 .../paravance/nodes/paravance-69.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-7.yaml |  2 +
 .../paravance/nodes/paravance-70.yaml         |  2 +
 .../paravance/nodes/paravance-71.yaml         |  2 +
 .../paravance/nodes/paravance-72.yaml         |  2 +
 .../clusters/paravance/nodes/paravance-8.yaml |  2 +
 .../clusters/paravance/nodes/paravance-9.yaml |  2 +
 .../rennes/clusters/paravance/paravance.yaml  |  2 -
 .../sophia/clusters/uvb/nodes/uvb-1.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-10.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-11.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-12.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-14.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-15.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-16.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-17.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-18.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-19.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-2.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-20.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-21.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-22.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-23.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-24.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-25.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-26.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-27.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-28.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-29.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-3.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-30.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-31.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-32.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-33.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-34.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-35.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-36.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-37.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-38.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-39.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-4.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-40.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-41.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-42.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-43.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-44.yaml     |  1 +
 .../sophia/clusters/uvb/nodes/uvb-5.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-6.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-7.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-8.yaml      |  1 +
 .../sophia/clusters/uvb/nodes/uvb-9.yaml      |  1 +
 .../sites/sophia/clusters/uvb/uvb.yaml        |  1 -
 scripts/edit-input-storage.rb                 | 39 +++++++++++++++++++
 846 files changed, 1568 insertions(+), 87 deletions(-)
 create mode 100755 scripts/edit-input-storage.rb

diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
index a1cd1ef1b0e..541dcdd833f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
@@ -42,10 +42,7 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
       sdc:
         interface: SATA
-        storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
index bd76ca5182f..eeb4aecd81d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -81,17 +81,20 @@ dahu-1:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfd50"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
index a75c52730e7..f7ab9946fd6 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -81,17 +81,20 @@ dahu-10:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b09"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59eee40"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
index a5e9d0d6654..952fb59af41 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -81,17 +81,20 @@ dahu-11:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b18"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c5a06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
index c9288158772..60784bd38e9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -81,17 +81,20 @@ dahu-12:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b16"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f5333"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
index 3e0173667f3..7f9297a180c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -81,17 +81,20 @@ dahu-13:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108c2b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bee44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
index 4421302c0f5..125d9803b84 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -81,17 +81,20 @@ dahu-14:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b54"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c855e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
index 324d1c200f7..989ca5941dd 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -81,17 +81,20 @@ dahu-15:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c408c212f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfe44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
index ee6df49b773..431c5cef87c 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -81,17 +81,20 @@ dahu-16:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107f0a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be813"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
index 1ea841317a2..f1cab212675 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -81,17 +81,20 @@ dahu-17:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ade"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f2445"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
index f633b1f2123..8c9fea86703 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -81,17 +81,20 @@ dahu-18:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aee"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f6e03"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
index c2da2e1f0e9..a63c668f06a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -81,17 +81,20 @@ dahu-19:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107adf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59b9b2a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
index 1c7efda4e73..64b24186df5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -81,17 +81,20 @@ dahu-2:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bf16d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
index 1920d49693b..ae71cfceadb 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -81,17 +81,20 @@ dahu-20:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ae1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c6300"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
index 0a92eca2264..c8b4bfbf212 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -81,17 +81,20 @@ dahu-21:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aed"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c85a2"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
index 9c71db6c667..4e04fb78676 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -81,17 +81,20 @@ dahu-22:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bdfbc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
index af2ef40a00a..323d97db808 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -81,17 +81,20 @@ dahu-23:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b05"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be5d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
index dade4e0498f..25dc1b8c8ec 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -81,17 +81,20 @@ dahu-24:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ba245"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
index 66fa2e12f0e..e16227a7cb0 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -81,17 +81,20 @@ dahu-25:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a171a0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
index 48ee4e13204..7ae58dabb09 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -81,17 +81,20 @@ dahu-26:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b26"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ed6c7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
index 5c25dbdb04f..33d4d70b000 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -81,17 +81,20 @@ dahu-27:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b23"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f1bfa"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
index a09311cb840..61812afae22 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -81,17 +81,20 @@ dahu-28:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108792"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59baaab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
index e799ade3760..606b07dcb94 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -81,17 +81,20 @@ dahu-29:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bb3fc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
index 9ad63b2dfac..19315101628 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -81,17 +81,20 @@ dahu-3:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bd027"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
index c1807a361ec..fa6846f3057 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -81,17 +81,20 @@ dahu-30:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a1b937"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
index 127a3f48f36..60ce99cd6e3 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -81,17 +81,20 @@ dahu-31:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bdd"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c90ac"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
index 39aaa4ad329..10fad1b9691 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -81,17 +81,20 @@ dahu-32:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bea5a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
index 5cf1ec03d5d..eaa435cfcd5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -81,17 +81,20 @@ dahu-4:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b07"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c1fa4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
index 39291a58a23..a84a7ffe55b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -81,17 +81,20 @@ dahu-5:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c0047"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
index feb2c15d9f2..b3307c9a7c4 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -81,17 +81,20 @@ dahu-6:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfa82"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
index 7f94f5de486..576b5c66e0e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -81,17 +81,20 @@ dahu-7:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ab8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a16fb1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB32
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
index 564b7be880a..e6f9f383d8b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -81,17 +81,20 @@ dahu-8:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be557"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
index e6c7bb0fc25..af76cbe39d9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -81,17 +81,20 @@ dahu-9:
       firmware_version: GD57
       model: MZ7KM240HMHQ0D3
       size: 240057409536
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107cba"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
       model: MZ7KM480HMHQ0D3
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c79a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
       model: ST4000NM0265-2DC
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
index ec8d28b18b5..e70af291560 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -60,7 +60,5 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
       sdb:
         interface: SATA
-        storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
index dd6dbdec861..56c30758507 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -161,9 +161,11 @@ drac-1:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c18078e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
index 20013d4ff26..87c8e1122b8 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -161,9 +161,11 @@ drac-10:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081027356"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
index a53b18faeef..aa94021cb3b 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -161,9 +161,11 @@ drac-11:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106cbd"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
index 4b87817c3aa..eb3cf012826 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -161,9 +161,11 @@ drac-12:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106db5"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
index 80212ad6442..5175c5cb1c7 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -161,9 +161,11 @@ drac-2:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081107893"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
index 176a6d92e15..45b58fac184 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -161,9 +161,11 @@ drac-3:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5a66ac"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
index f1bc5051643..7cb9614c4e9 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -161,9 +161,11 @@ drac-4:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081026d3e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
index 81b93b40886..ed6e03a0af1 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -161,9 +161,11 @@ drac-5:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5cb8a9"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
index 83e39dcddd5..15c876bc15a 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -161,9 +161,11 @@ drac-6:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50081108685"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
index b4520427455..700c899d194 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -161,9 +161,11 @@ drac-7:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008111f2af"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
index ddb87e3aade..8bc281b1292 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -161,9 +161,11 @@ drac-8:
       firmware_version: BE32
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008110789b"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
index 988f6c41662..efd90a935c4 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -161,9 +161,11 @@ drac-9:
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5ab80c"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
       model: ST1000NX0313
       size: 1000204886016
+      storage: HDD
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
index bb7ba5b64d0..0040f123d36 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -81,11 +81,13 @@ troll-1:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122febd94"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
index 2861258c154..9d3146a7538 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -81,11 +81,13 @@ troll-2:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122feba5f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
index 4cad49b5256..14df3fbc9d8 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -81,11 +81,13 @@ troll-3:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122fea331"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
index da0926007f4..85ca4cd654d 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -81,11 +81,13 @@ troll-4:
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500a075122feba61"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
index 57032f42621..da21b602f81 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
@@ -40,10 +40,8 @@ nodes:
     storage_devices:
       nvme0n1:
         interface: NVME
-        storage: SSD
       sda:
         interface: SATA
-        storage: SSD
     monitoring:
       wattmeter: true
     sensors:
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 471146e2991..9cb12263fdf 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -98,29 +98,34 @@ yeti-1:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de1d705"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08870d7"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0897757"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae94bf"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index 10e97e15207..eea5565fe57 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -98,29 +98,34 @@ yeti-2:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de16d7a"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08aab8f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a088ce2f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae06af"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index 216550a97a4..d5bdb4ddffa 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -98,29 +98,34 @@ yeti-3:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4150a22f9b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL65
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a4beb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a089563f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0adf81f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index d979af424f3..eb5bf9dca05 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -98,29 +98,34 @@ yeti-4:
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
+      storage: SSD
     sda:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414de0fa6e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5A
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a9c6b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a08a7bb3"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a0ae58b3"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: NT32
       model: ST2000NX0463
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
index 7c0c444ad11..d1cdc27a58b 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
@@ -48,21 +48,16 @@ nodes:
     storage_devices:
       nvme0n1:
         interface: NVME
-        storage: SSD
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
     monitoring:
       wattmeter: true
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
index a573aafa7d6..9c4fde9c1c1 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
@@ -47,7 +47,5 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
index 848910c2c2e..96023687658 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -88,11 +88,13 @@ chetemi-1:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c06c7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
index 9cf8b520c5a..2936d826f28 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -88,11 +88,13 @@ chetemi-10:
       firmware_version: KT37
       model: ST600MP0036
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be5d7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
index 0c7c411d249..6280325c10e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -88,11 +88,13 @@ chetemi-11:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c29ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
index 8bc809e7ff3..4e55d5f8d92 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -88,11 +88,13 @@ chetemi-12:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be0d3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
index e4213498111..21a39de591d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -88,11 +88,13 @@ chetemi-13:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdf6f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
index 0dec96bcc01..8d201849212 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -88,11 +88,13 @@ chetemi-14:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bacaf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
index 54bbee91b8d..3798e76d6bb 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -88,11 +88,13 @@ chetemi-15:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bc92b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
index 3e3c11f439e..98736c05252 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -88,11 +88,13 @@ chetemi-2:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c11d3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
index d8911f201fa..4f0eb3c2472 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -88,11 +88,13 @@ chetemi-3:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c2b5f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
index 0d2bb00496c..93660a94683 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -88,11 +88,13 @@ chetemi-4:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1723"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
index 30f5f9df9ea..5f90382016b 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -88,11 +88,13 @@ chetemi-5:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdb03"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
index 758c20e1d12..01be9f7bffe 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -88,11 +88,13 @@ chetemi-6:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bf523"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
index 915d1fbd461..104b6e74bb7 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -88,11 +88,13 @@ chetemi-7:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c34ff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
index d0d778e5cf8..82cbf921b37 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -88,11 +88,13 @@ chetemi-8:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c310b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
index 29dcb5af45e..2d59677e433 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -88,11 +88,13 @@ chetemi-9:
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1dbf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: VT33
       model: ST300MP0005
       size: 300000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
index cb0ae87031e..32f27bbb2af 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
@@ -55,12 +55,9 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
index 51b9a8e0ded..65085e22fb9 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -106,17 +106,20 @@ chiclet-1:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eb7f7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64daa5f"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
index 133c1495131..89c58d1533b 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -106,17 +106,20 @@ chiclet-2:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ef6e3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e05d7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
index 150656e2606..39335aa2971 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -106,17 +106,20 @@ chiclet-3:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d96f3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e26af"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
index ad337ef923a..3fe306ea93b 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -106,17 +106,20 @@ chiclet-4:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec373"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d90c7"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
index ff3552c09dc..969777ba347 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -106,17 +106,20 @@ chiclet-5:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64dc72f"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64df1eb"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
index dcadab31b4c..4019f34388e 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -106,17 +106,20 @@ chiclet-6:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d6cd3"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64db00b"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
index 3ee0f8d65a5..189b114e8a9 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -106,17 +106,20 @@ chiclet-7:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e09fb"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d279b"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
index 9c64bed57bd..e773cec2d79 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -106,17 +106,20 @@ chiclet-8:
       firmware_version: AS0E
       model: PX05SVB048Y
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e0c83"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:1:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec817"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
index e1bcb11ee5d..3afd2c42864 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
@@ -47,16 +47,12 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
       sdb:
         interface: SAS
-        storage: SSD
         reservation: true
       sdc:
         interface: SATA
-        storage: HDD
         reservation: true
       sdd:
         interface: SATA
-        storage: HDD
         reservation: true
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index 8f0c690382b..10a6fabc420 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -105,23 +105,27 @@ chifflet-1:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68a5"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973b80345a"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index 312572a1608..4dd48cb213f 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -105,23 +105,27 @@ chifflet-2:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ad9"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828eb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e9"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index cc10b6141ca..80dec0e34af 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -105,23 +105,27 @@ chifflet-3:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a99"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b54"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index cfbed1842e9..b701e047db2 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -105,23 +105,27 @@ chifflet-4:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac9"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f2"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e6"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index 28095f81b47..7c1f251ba21 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -105,23 +105,27 @@ chifflet-5:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a81"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ea"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ee"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index c8098c59fd9..0e2c7721f4a 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -105,23 +105,27 @@ chifflet-6:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac5"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b56"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b58"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index 4f935ba7be5..dade29c1c29 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -105,23 +105,27 @@ chifflet-7:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a85"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f1"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index 931fcc2bfc3..8f90c7b7135 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -105,23 +105,27 @@ chifflet-8:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a91"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e8"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
index e64003ac134..d0da4260491 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
@@ -55,24 +55,18 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
       sde:
         interface: SAS
-        storage: HDD
         reservation: true
       sdf:
         interface: SAS
-        storage: HDD
         reservation: true
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
index 62662529364..705157eb425 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -123,35 +123,41 @@ chifflot-1:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b5341"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e236f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d9e47"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e447b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64df333"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
index 7022133207a..e3753660277 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -123,35 +123,41 @@ chifflot-2:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b5361"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ec36b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64db51f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eb823"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ebc97"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
index 81cafabdd64..27ac7860b76 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -123,35 +123,41 @@ chifflot-3:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b530e"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213ef9"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213e0d"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000398c8213b61"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000398c820eb65"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: EG03
       model: MG04SCA40ENY
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
index 61598a8e17c..983184babee 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -123,35 +123,41 @@ chifflot-4:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52e1"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eabab"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eac67"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d6557"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e4f0b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
index 919ccc1319a..29f1129886d 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -123,35 +123,41 @@ chifflot-5:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52aa"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d3fc7"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64eddeb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64d9a9b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64de323"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
index 62a521fe8e5..6c0ecf30800 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -123,35 +123,41 @@ chifflot-6:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b52e6"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e64bb"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e195b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64ecc33"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000c500a64e087f"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: DT32
       model: ST4000NM0295
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
index 5ce21791837..3eec0da4d89 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -123,35 +123,41 @@ chifflot-7:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d34"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792f38"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000cca2697930a8"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792dd0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792fb0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
index e8c263d3ad9..bc34f8e595b 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -123,35 +123,41 @@ chifflot-8:
       firmware_version: SCV1DL5C
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b3de6"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"
       firmware_version: SCV1DL58
       model: SSDSC2KG480G7R
       size: 480103981056
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269788468"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000cca26979314c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792d1c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:4:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x5000cca269792e7c"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:5:0"
       firmware_version: KU27
       model: HUS726040ALS210
       size: 4000787030016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index ec15bcf48b1..503de440002 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -70,5 +70,6 @@ petitprince-1:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index fc47792561e..d36e8bf2266 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -70,5 +70,6 @@ petitprince-10:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index b306db6d34a..ce962061793 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -70,5 +70,6 @@ petitprince-11:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index d56ba57201d..98988753c9e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -70,5 +70,6 @@ petitprince-13:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index 6209c9ab812..65878904217 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -70,5 +70,6 @@ petitprince-14:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index 4c40499e706..3f597b0be42 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -70,5 +70,6 @@ petitprince-15:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index 7e1084cd71f..e018291db0c 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -70,5 +70,6 @@ petitprince-16:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index 7a2066d80ec..7737e486b8e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -70,5 +70,6 @@ petitprince-2:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index 3078e87d842..7b2c1561318 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -70,5 +70,6 @@ petitprince-3:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index 392873b3cfa..1198639efd7 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -70,5 +70,6 @@ petitprince-4:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index 78495bb96ff..555986e33f7 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -70,5 +70,6 @@ petitprince-5:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index aa56927d284..bfbd9e46322 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -70,5 +70,6 @@ petitprince-6:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index 1847a4835ec..a84e6d4d395 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -70,5 +70,6 @@ petitprince-7:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index 6db6872a252..d171af3dede 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -70,5 +70,6 @@ petitprince-8:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index 10f8275bf44..858b2646878 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -70,5 +70,6 @@ petitprince-9:
       firmware_version: AA08
       model: ST9250610NS
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index 8eba4668ba2..bbae14e860e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -20,7 +20,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
index 97ed1f00550..227c694e219 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
@@ -16,22 +16,17 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
         reservation: true
       sdc:
         interface: SATA
-        storage: SSD
         reservation: true
       sdd:
         interface: SATA
-        storage: SSD
         reservation: true
       sde:
         interface: SATA
-        storage: SSD
         reservation: true
     processor:
       microarchitecture: Broadwell
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 8b2e0a5e63c..bd34d561490 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -179,29 +179,34 @@ gemini-1:
       firmware_version: GXM5104Q
       model: SAMSUNG MZ7KM480
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index 444f1f94136..68fa50e6a62 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -179,29 +179,34 @@ gemini-2:
       firmware_version: GXM5104Q
       model: SAMSUNG MZ7KM480
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3459"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 5f1cbd132a6..3052c6b2785 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -21,13 +21,10 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
       sdb:
         interface: SATA
-        storage: HDD
       sdc:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: false
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index b87d6d2f1d7..9a8aa9eb0ae 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -87,17 +87,20 @@ hercule-1:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7ce58"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0f47"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index 72b41c23335..5da8c07c477 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -87,17 +87,20 @@ hercule-2:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d1dc2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7f10e"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index 0bf9c2b739b..e662e2d7754 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -87,17 +87,20 @@ hercule-3:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7ff85"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e80cae"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 915d4561a41..5c36be73393 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -87,17 +87,20 @@ hercule-4:
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d2a85"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-2"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0180"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-3"
       firmware_version: 01.01D02
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
index 3c0fe5a1f1d..253e97821ff 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -105,5 +105,6 @@ nova-1:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
index 42a7dba486a..c550f890b86 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -105,5 +105,6 @@ nova-10:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
index f5e9e01b8f6..b5f52bcc31f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -105,5 +105,6 @@ nova-11:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
index 3e7fe90e184..ca10084a943 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -105,5 +105,6 @@ nova-12:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
index 46f8dea1d0d..b460db28188 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -105,5 +105,6 @@ nova-13:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
index 033b378fa9e..78f403c51f0 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -105,5 +105,6 @@ nova-14:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
index af36b6b091d..70b1b2cabc2 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -105,5 +105,6 @@ nova-15:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
index 4c3a5dbacd0..d145f72533b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -105,5 +105,6 @@ nova-16:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
index 4de54c73443..c078660d1ce 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -105,5 +105,6 @@ nova-17:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
index 928ea927607..8e27a6992ec 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -105,5 +105,6 @@ nova-18:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
index a677d132018..7a64670e9f8 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -105,5 +105,6 @@ nova-19:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
index 3fc25fe68dc..55545861da3 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -105,5 +105,6 @@ nova-2:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
index fc06069862f..aa0a883e811 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -105,5 +105,6 @@ nova-20:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
index a4a7b2656a6..7d5df00d756 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -105,5 +105,6 @@ nova-21:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
index f987dad3cd6..a17e6840a8b 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -105,5 +105,6 @@ nova-22:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
index b83aa9e533a..ff7f497c512 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -105,5 +105,6 @@ nova-23:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
index 46ff37551fe..4c3544a0556 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -105,5 +105,6 @@ nova-3:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
index 7f06435612d..78cd2608894 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -105,5 +105,6 @@ nova-4:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
index 96d9118755f..4b6789dc122 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -105,5 +105,6 @@ nova-5:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
index 8dae4a6ba83..09cc8952957 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -105,5 +105,6 @@ nova-6:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
index 4d03b295704..5a0b1a3ec9a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -105,5 +105,6 @@ nova-7:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
index 80e5892d22c..7cb4700bb46 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -105,5 +105,6 @@ nova-8:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
index 71f70488ba8..2c409c86991 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -105,5 +105,6 @@ nova-9:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yaml b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
index 2c6785924d3..6ad68e9dd79 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
@@ -21,7 +21,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-0 (2 disks)
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index 74bd1b7bf39..b55adee8709 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -105,5 +105,6 @@ orion-1:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index 749eede86ff..506f3a14e1f 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -105,5 +105,6 @@ orion-2:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index f58d679ef0d..ea58aa187b1 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -105,5 +105,6 @@ orion-3:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index 2e2bde5f50d..348f50a20d6 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -105,5 +105,6 @@ orion-4:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index ba36afe41df..b63ec046785 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -21,7 +21,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-0 (2 disks)
-        storage: HDD
     gpu_devices:
       nvidia0:
         cpu_affinity: 1
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
index 5b2505d7e44..28c5ca78823 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -81,11 +81,13 @@ pyxis-1:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53daa"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
index ee7d52eccf9..bfab8f79cbc 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -81,11 +81,13 @@ pyxis-2:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53da8"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
index 52e3ce8becd..f629d895506 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -81,11 +81,13 @@ pyxis-3:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53da9"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
index 8ff63b63893..8a4daad04ef 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -81,11 +81,13 @@ pyxis-4:
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de8"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy3-lun-0"
       firmware_version: RVT02B6Q
       model: Samsung SSD 860
       size: 250059350016
+      storage: SSD
   supported_job_types:
     virtual: arm64
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
index b684e5fdba3..fcf87814ef3 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
@@ -34,10 +34,8 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
     monitoring:
       wattmeter: true
     sensors:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index be637d06cc9..a034c1401b9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -68,5 +68,6 @@ sagittaire-11:
       firmware_version: 8
       model: ST373307LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index 5fe0001e5e2..53e06ab4baa 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -68,5 +68,6 @@ sagittaire-12:
       firmware_version: 8
       model: ST373307LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 3c357243a7a..62d044390fd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -68,5 +68,6 @@ sagittaire-13:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index 28cac22ebcc..bc55f9f24da 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -68,5 +68,6 @@ sagittaire-14:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index bc56f72aeda..c3062e16b8c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -68,5 +68,6 @@ sagittaire-15:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 470e5e0af3b..6d5cc7d10ac 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -68,5 +68,6 @@ sagittaire-16:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 59ae482e6c1..84651978881 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -68,5 +68,6 @@ sagittaire-17:
       firmware_version: 104
       model: MAT3073NC
       size: 73543163904
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index 4ef763f5f18..3dd80248d82 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -68,5 +68,6 @@ sagittaire-18:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index 417818b7c5a..40c30105716 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -68,5 +68,6 @@ sagittaire-19:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 9107ec5d3b1..adf0db89452 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -68,5 +68,6 @@ sagittaire-2:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index c04891653da..abc567abc7c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -68,5 +68,6 @@ sagittaire-20:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index 36ba0247cec..4efc4c8c892 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -68,5 +68,6 @@ sagittaire-24:
       firmware_version: 104
       model: MAT3073NC
       size: 73543163904
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 3fb97ddc9a8..12fae3eb909 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -68,5 +68,6 @@ sagittaire-27:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index 4f3b93b1da9..0a919580618 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -68,5 +68,6 @@ sagittaire-29:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index 2890679838c..f618ec6ac34 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -68,5 +68,6 @@ sagittaire-3:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index c9b475fd48c..829b9c22f12 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -68,5 +68,6 @@ sagittaire-30:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index 1cc37b40ecf..0a1aaef6caa 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -68,5 +68,6 @@ sagittaire-31:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index 784a1bfaa29..ed45194b792 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -68,5 +68,6 @@ sagittaire-4:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index c94e457a134..34f7306186a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -68,5 +68,6 @@ sagittaire-5:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index fe4bacb06c5..497c958b0cb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -68,5 +68,6 @@ sagittaire-6:
       firmware_version: 2
       model: ST373207LC
       size: 73407868928
+      storage: HDD
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index d4c0316f39d..535181e516f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -34,7 +34,6 @@ nodes:
     storage_devices:
       sda:
         interface: SCSI
-        storage: HDD
     network_adapters:
       eth0:
         enabled: false
@@ -70,7 +69,6 @@ nodes:
       sdb:
         interface: SCSI
         driver: mptspi
-        storage: HDD
         model: MAT3073NC
         vendor: FUJITSU
         rev: 104
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 88920fc3cdd..75688d4adc6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -105,5 +105,6 @@ taurus-1:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index c004189bcb0..83d296b3ba4 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -105,5 +105,6 @@ taurus-10:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index 75cc5a6ac6b..c54b6c18b06 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -105,5 +105,6 @@ taurus-11:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 4a793ffb126..1d71a9c7fc8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -105,5 +105,6 @@ taurus-12:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index cd19c9c38c0..14ba9cff6ce 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -105,5 +105,6 @@ taurus-13:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index 071704d5005..c73a56bbe48 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -105,5 +105,6 @@ taurus-15:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index caee83046d8..a625d6c7ffc 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -105,5 +105,6 @@ taurus-2:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index a221afe37fb..2d3c69592df 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -105,5 +105,6 @@ taurus-3:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index bc133aadc4e..b9ab5d18020 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -105,5 +105,6 @@ taurus-4:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index a29761f1c2f..c3af4647367 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -105,5 +105,6 @@ taurus-5:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index 8b620918fd8..8eeb8c49a2f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -105,5 +105,6 @@ taurus-6:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index ce953994321..6f8c1a9bef8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -105,5 +105,6 @@ taurus-7:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index 82c0360bf67..006e0ca47ba 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -105,5 +105,6 @@ taurus-8:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index 43b54b7152c..e6de5b1355a 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -105,5 +105,6 @@ taurus-9:
       firmware_version: 3.13
       model: PERC H710
       size: 598879502336
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index cd8a04e2302..8efb70acedd 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -26,7 +26,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-0 (2 disks)
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
index e4c7d9f2a26..523e2d45a6f 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
@@ -44,7 +44,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
   graffiti-[1-3]:
     supported_job_types:
       max_walltime: 86400
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
index 6d8763e408b..47a65082692 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -120,5 +120,6 @@ graffiti-1:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
index 568b0d17568..6dcd5e9bcdd 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -120,5 +120,6 @@ graffiti-10:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
index a7f5f65f655..6933c1f71ce 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -120,5 +120,6 @@ graffiti-11:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
index 62efccc0668..0da9d131950 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -120,5 +120,6 @@ graffiti-12:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
index 96d036c417e..b069f21abca 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -120,5 +120,6 @@ graffiti-13:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
index a17ecd094e2..081e71b2a74 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -120,5 +120,6 @@ graffiti-2:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
index 55adbbdfeb7..12836c8fa99 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -120,5 +120,6 @@ graffiti-3:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
index 56971d01365..6ba8462d1bf 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -120,5 +120,6 @@ graffiti-4:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
index 656c5833aaf..a6b07caa292 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -120,5 +120,6 @@ graffiti-5:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
index d97b29b0dea..f5b8ce013c4 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -120,5 +120,6 @@ graffiti-6:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
index 15310e847b5..acee40cd55a 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -120,5 +120,6 @@ graffiti-7:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
index c2df6bce515..07ad75c3ca0 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -120,5 +120,6 @@ graffiti-8:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
index 38e0b18fe37..a25ca49d35c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -120,5 +120,6 @@ graffiti-9:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
index 2df3252d116..4949c45bfc2 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -21,10 +21,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index e912a831b1c..f936006375c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -117,11 +117,13 @@ graoully-1:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41b51f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index 108ef56fd4b..0b07be9a029 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -117,11 +117,13 @@ graoully-10:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510003"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index c296223f84f..c92ff4dbf51 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -117,11 +117,13 @@ graoully-11:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510db3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index e1a991d3a4d..9cd08e19bc1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -117,11 +117,13 @@ graoully-12:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffb43"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index eda1b463b63..2f9ff3ff409 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -117,11 +117,13 @@ graoully-13:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e46fd17"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
index 773288ccbb3..0a17aa7c167 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -117,11 +117,13 @@ graoully-14:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcfcf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index ce7431470e1..de43c0f0873 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -117,11 +117,13 @@ graoully-15:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffecf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index 3be4b926a4b..3ac65de3371 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -117,11 +117,13 @@ graoully-16:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5149f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index df432351c18..7b674cbe6f2 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -117,11 +117,13 @@ graoully-2:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43a327"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index f56c633cd19..57b702e2365 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -117,11 +117,13 @@ graoully-3:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e823"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index f2f3ecd6f1c..29596657342 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -117,11 +117,13 @@ graoully-4:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50db0b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index b120cd1df4c..97439988efd 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -117,11 +117,13 @@ graoully-5:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index 525931b7101..6628f160599 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -117,11 +117,13 @@ graoully-6:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f367"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
index b500e1e48f6..40dcf228474 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -117,11 +117,13 @@ graoully-7:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51369b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
index 67378041440..7aa405b2497 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -117,11 +117,13 @@ graoully-8:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc813"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
index 905848b2720..065693bbdcf 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -117,11 +117,13 @@ graoully-9:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index 7267a5a3957..1339ca9c610 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -21,7 +21,6 @@ nodes:
     storage_devices:
       sda:
         interface: RAID-1 (2 disks)
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 17f7450c18c..ba533160be3 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -116,5 +116,6 @@ graphique-1:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index 0c9f992b087..09ecd2e065f 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -116,5 +116,6 @@ graphique-2:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
index ba646b65b53..4fcd0a7744f 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -116,5 +116,6 @@ graphique-3:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
index 22eedfc0568..7484afe40dc 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -116,5 +116,6 @@ graphique-4:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index e96988c8fc2..18ce7f46dcd 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -116,5 +116,6 @@ graphique-5:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
index 228a91f0f75..d12c07dfed9 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -116,5 +116,6 @@ graphique-6:
       firmware_version: 4.3
       model: PERC H330 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
index 951130ff60c..6efeb125ca8 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -22,10 +22,8 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 0602772c5ef..fb733a9cac7 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -99,11 +99,13 @@ graphite-1:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 909f25b4199..20d62f999ff 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -99,11 +99,13 @@ graphite-2:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f36800e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index a35fb28c4ad..0e5ca275197 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -99,11 +99,13 @@ graphite-3:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f368095e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index 31e0f7796f5..854b64bc2c4 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -99,11 +99,13 @@ graphite-4:
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50015178f368041d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: D201DL13
       model: INTEL SSDSC2BB30
       size: 300069052416
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
index f0930c81535..1614bd49ef6 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
@@ -49,11 +49,9 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
         #model: PERC H330 Mini
       sdb:
         interface: SAS
-        storage: HDD
         #model: PERC H330 Mini
         reservation: true
     sensors:
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
index 66d9f784360..bde490c1c84 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -105,11 +105,13 @@ grappe-1:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca665883"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
index 318968b57d8..aed13c09c3f 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -105,11 +105,13 @@ grappe-10:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e0f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
index f194171ecca..04ad88c7e3e 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -105,11 +105,13 @@ grappe-11:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6661b7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
index fba64a17c87..a40221de21c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -105,11 +105,13 @@ grappe-12:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6692df"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
index 5567128cbe8..cd12e55481c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -105,11 +105,13 @@ grappe-13:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6791ab"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
index 9601265157c..8a0a3213962 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -105,11 +105,13 @@ grappe-14:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66774f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
index d98da3c5f8f..af40d3c6b75 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -105,11 +105,13 @@ grappe-15:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca666e9b"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
index 96964dc1d54..64daeae3e0c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -105,11 +105,13 @@ grappe-16:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6657df"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
index f095fc895a3..38446c88d61 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -105,11 +105,13 @@ grappe-2:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca662ebb"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
index 5ebde334768..f203e5933dd 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -105,11 +105,13 @@ grappe-3:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca6653c7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
index c5ee8fd7eae..1bed5849841 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -105,11 +105,13 @@ grappe-4:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66add7"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
index 2a9a8eef751..145cdbed255 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -105,11 +105,13 @@ grappe-5:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664d07"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
index 8d1cb34590d..6f85aa0141f 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -105,11 +105,13 @@ grappe-6:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a5d3"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
index 26c0e12e83b..5fd8c1b7b01 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -105,11 +105,13 @@ grappe-7:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e87"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
index e6b6f1276f6..839f50ed7e0 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -105,11 +105,13 @@ grappe-8:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a3ff"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
index 5ffd0e3ed99..071acb1eaea 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -105,11 +105,13 @@ grappe-9:
       firmware_version: XCV1DL67
       model: SSDSC2KG480G8R
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c500ca665b7f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
       firmware_version: PT54
       model: ST8000NM0185
       size: 8001563222016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
index 3065d44fcd2..6a2e1a3191a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
@@ -39,7 +39,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     monitoring:
       wattmeter: shared
       metric: power
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
index d9fc976b381..f1baf5b9f8b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -81,5 +81,6 @@ grcinq-1:
       firmware_version: GA0F
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
index bd5795b9b91..a6d3f3bd454 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -81,5 +81,6 @@ grcinq-10:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
index 33371b147b3..e12dd33f4e3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -81,5 +81,6 @@ grcinq-11:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
index 56b45026fe8..8412361bc40 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -81,5 +81,6 @@ grcinq-12:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
index fc978ff05dd..f66f32e0611 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -81,5 +81,6 @@ grcinq-13:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
index 95c7b97a258..da6b35304d8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -81,5 +81,6 @@ grcinq-14:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
index caf37c471f0..d8804ca9e6b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -81,5 +81,6 @@ grcinq-15:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
index b2ca78436d4..1baf89aec2c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -81,5 +81,6 @@ grcinq-16:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
index bd2ff9e6d2b..194d9464001 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -81,5 +81,6 @@ grcinq-17:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
index 7eb39378638..5c45ff66e59 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -81,5 +81,6 @@ grcinq-18:
       firmware_version: GA06
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
index 8c5475c3173..ed254ef1a29 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -81,5 +81,6 @@ grcinq-19:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
index 26d0cd7ff7b..cf98f090574 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -81,5 +81,6 @@ grcinq-2:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
index bffc81a2302..041c3daafa1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -81,5 +81,6 @@ grcinq-20:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
index d6509be8f38..a6e88c398a2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -81,5 +81,6 @@ grcinq-21:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
index 8e778164fbc..1504bac4bb6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -81,5 +81,6 @@ grcinq-22:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
index cebeca59f96..9ef0528c28b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -81,5 +81,6 @@ grcinq-23:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
index a1850812c64..fb1b15573fe 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -81,5 +81,6 @@ grcinq-24:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
index cf23109ad44..295d96c6145 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -81,5 +81,6 @@ grcinq-25:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
index 12e9cd2c337..6c74e316f4b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -81,5 +81,6 @@ grcinq-26:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
index b7c9f5139c5..95e201e3f69 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -81,5 +81,6 @@ grcinq-27:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
index b54dcfee48c..398e870f026 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -81,5 +81,6 @@ grcinq-28:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
index 7637d6aee82..0bf1b53ab6d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -81,5 +81,6 @@ grcinq-29:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
index 1c777870c08..3ee2aa415b2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -81,5 +81,6 @@ grcinq-3:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
index ee1ada80680..ce848a9a638 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -81,5 +81,6 @@ grcinq-30:
       firmware_version: GA10
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
index c1879c0d1f9..b3c6c0f4fc7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -81,5 +81,6 @@ grcinq-31:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
index 70fe659c945..bfd8c65b459 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -81,5 +81,6 @@ grcinq-32:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
index eb88788f742..4d2bd1ad9e2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -81,5 +81,6 @@ grcinq-33:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
index 092f35ef5e7..68644a989db 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -81,5 +81,6 @@ grcinq-34:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
index 286e29e55c1..f94b8e4c77f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -81,5 +81,6 @@ grcinq-35:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
index a8d6b0ed330..28a872ae18f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -81,5 +81,6 @@ grcinq-36:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
index 44a1a7e1afa..2dce411626d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -81,5 +81,6 @@ grcinq-37:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
index 25a910d0d0d..e54f92385e0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -81,5 +81,6 @@ grcinq-38:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
index 91c79e850f3..5b22938642d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -81,5 +81,6 @@ grcinq-39:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
index dc7e3e9d56a..55a446c9ef4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -81,5 +81,6 @@ grcinq-4:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
index 4b57b0fce45..62ed14719ca 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -81,5 +81,6 @@ grcinq-40:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
index 214d99a69f9..57508b33deb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -81,5 +81,6 @@ grcinq-41:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
index bb03f32c46b..beb04cef55e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -81,5 +81,6 @@ grcinq-42:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
index e84fb28767d..335281a772e 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -81,5 +81,6 @@ grcinq-43:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
index 143a6cf317f..d4da80c75ca 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -81,5 +81,6 @@ grcinq-44:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
index 1cf62d5297f..6421c4a1b1f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -81,5 +81,6 @@ grcinq-45:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
index 5bb3c1513fe..c70484f7e46 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -81,5 +81,6 @@ grcinq-46:
       firmware_version: GA10
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
index e4d4616afb1..c1a1534220c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -81,5 +81,6 @@ grcinq-47:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
index 4d5d01cd586..ba654a82e44 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -81,5 +81,6 @@ grcinq-5:
       firmware_version: GA10
       model: ST1000NM0033-9ZM
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
index 8abfb79392f..5282d76c80c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -81,5 +81,6 @@ grcinq-6:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
index 21b87db8c92..4c98a8542a5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -81,5 +81,6 @@ grcinq-7:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
index 3cbff528e18..7bd4bb151fb 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -81,5 +81,6 @@ grcinq-8:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
index cc932049b12..12a546afaa8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -81,5 +81,6 @@ grcinq-9:
       firmware_version: 01.01V03
       model: WDC WD1003FBYX-1
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele.yaml b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
index b6dc6a0d246..0e4b95970ed 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
@@ -51,10 +51,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
 
   grele-[1-3]:
     supported_job_types:
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
index a696171eb4b..c777a491ffa 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -116,11 +116,13 @@ grele-1:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed290020f0ff3c049eabaa"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
index 1547db01aa9..f629b367a92 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -116,11 +116,13 @@ grele-10:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed620020f1032e04c5f7ae"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
index 17c2277e6cc..f96a5dd4016 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -116,11 +116,13 @@ grele-11:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4a0020f1032d04c9185d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
index 02133e8dc8e..738ef0b4699 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -116,11 +116,13 @@ grele-12:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4e0020f1032d04c2acf4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
index e4ac3ada558..ee40ee42bb3 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -116,11 +116,13 @@ grele-13:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed730020f1032e04caaa9d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
index 68b5b85c979..4617a57c68c 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -116,11 +116,13 @@ grele-14:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed690020f1032d04c25600"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
index afbc9b173d9..3cbf5b882d6 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -116,11 +116,13 @@ grele-2:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed2a0020f1032b049a2ad8"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
index 7a69a855b39..5f6e9583aaf 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -116,11 +116,13 @@ grele-3:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6f0020f1032d04cc530a"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
index 85002539927..f0e57afbc75 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -116,11 +116,13 @@ grele-4:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d5f0020f1032e04c8712e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
index 737be1e52cd..70ef45fa149 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -116,11 +116,13 @@ grele-5:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4d0020f1032d04c354fb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
index d25475ee2e0..8f8dd11fcb8 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -116,11 +116,13 @@ grele-6:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d450020f1032d04c8387e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
index 61accc721b8..2d790fa9a01 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -116,11 +116,13 @@ grele-7:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4a0020f1032e04cc2521"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
index d63330bed27..e2d530b34cd 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -116,11 +116,13 @@ grele-8:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5edaa0020f1032e04ca950d"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
index 2be95775012..d917d88fd77 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -116,11 +116,13 @@ grele-9:
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6d0020f1032d04ce0efe"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
       model: PERC H730 Mini
       size: 299439751168
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
index 045b630bcd0..1b33ecc3c24 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
@@ -24,7 +24,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         mounted: true
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
index ce8dbbd34d9..0e4bf1256a9 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -116,5 +116,6 @@ grimani-1:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
index 769bb20b002..3512aea002d 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -116,5 +116,6 @@ grimani-2:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
index 01d7c560a7f..8e90715fc1c 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -116,5 +116,6 @@ grimani-3:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
index 767c9de5785..9648e326378 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -116,5 +116,6 @@ grimani-4:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
index 19e60e66a23..091b6f96558 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -116,5 +116,6 @@ grimani-5:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
index 66b4c3c18f7..d4272a69dc1 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -116,5 +116,6 @@ grimani-6:
       firmware_version: NA07
       model: ST1000NX0423
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
index 49b99cab93c..df5d632da24 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
@@ -22,26 +22,20 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
       sde:
         interface: SAS
-        storage: HDD
         reservation: true
       sdf:
         interface: SAS
-        storage: SSD
         reservation: true
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index be95b787123..13262a26f63 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -120,35 +120,41 @@ grimoire-1:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f88af"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4df"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index 41f2316d58d..72734282628 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -120,35 +120,41 @@ grimoire-2:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fd00f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f92df"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f948f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9127"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index 1082f868112..b7fb4f72639 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -120,35 +120,41 @@ grimoire-3:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513acb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d657"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513eb3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b07"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa284"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index 7c4e727ea54..1caf7e9b2a3 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -120,35 +120,41 @@ grimoire-4:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5261db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dd57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e500297"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5013af"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa634"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index ab5eba03d4e..0fd6715fcce 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -120,35 +120,41 @@ grimoire-5:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f7b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ea43"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51440b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51465f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa61c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index dc73cf58728..7bd4e93df3d 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -120,35 +120,41 @@ grimoire-6:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f920f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9bf3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f99c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fa8ff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2b0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index bdce5a15cfc..49c6f2b5ac0 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -120,35 +120,41 @@ grimoire-7:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50cd8f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501393"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4fb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501a77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa608"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index c231d60dd9d..c828ab2b57e 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -120,35 +120,41 @@ grimoire-8:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8777"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcff7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51004b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9f5f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa65c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 7b8d40f6fe3..cbb0ccd8f6b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -23,10 +23,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
     sensors:
       power:
         available: true
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index 5622eccc670..f48cf52e509 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -109,11 +109,13 @@ grisou-1:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510fe7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index 46ed401755e..9d1a109b691 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -109,11 +109,13 @@ grisou-10:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5145c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index d7749f3d64f..d733a7a48ef 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -109,11 +109,13 @@ grisou-11:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514357"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index 0aff4590307..34e39811eff 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -109,11 +109,13 @@ grisou-12:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51467f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index 6c3b5726ef3..659109b5ae7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -109,11 +109,13 @@ grisou-13:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fdd3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index 70edce12c9f..ca1409b3c60 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -109,11 +109,13 @@ grisou-14:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff643"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index 81e18128b0c..70b5ef53fb9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -109,11 +109,13 @@ grisou-15:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4facaf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 4d21af11185..0e6d2785ae2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -109,11 +109,13 @@ grisou-16:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5135bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index c2fa24aff67..3d66d347843 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -109,11 +109,13 @@ grisou-17:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510877"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index fcd8c966adb..7ba400ba42e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -109,11 +109,13 @@ grisou-18:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51125f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index 4604a8e5156..1a7fe3d6cc5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -109,11 +109,13 @@ grisou-19:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5116e3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index e06058d1785..4bb374fece5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -109,11 +109,13 @@ grisou-2:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510857"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index 55b4d055eec..96a26f3c26a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -109,11 +109,13 @@ grisou-20:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dbdb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index 6f142c6568a..12b7d59fa8b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -109,11 +109,13 @@ grisou-21:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e511057"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index 9954448be60..018143e1862 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -109,11 +109,13 @@ grisou-22:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51199b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index 4970546f8ec..236112bdcc1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -109,11 +109,13 @@ grisou-23:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43c0ef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index e411b5fc720..ecee0100f88 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -109,11 +109,13 @@ grisou-24:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff27f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index 00ab0ce1287..ce609cf892d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -109,11 +109,13 @@ grisou-25:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e473563"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index 1364f77aa28..6ea0f43bff1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -109,11 +109,13 @@ grisou-26:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50105b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index 9f32aee01ef..9c2e9127800 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -109,11 +109,13 @@ grisou-27:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50198f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 4c0ea468c8f..8d51feb06c2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -109,11 +109,13 @@ grisou-28:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5014e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index 9fd48d36834..e5c99263f92 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -109,11 +109,13 @@ grisou-29:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50163f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index 8859a12547d..bd8f261de0b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -109,11 +109,13 @@ grisou-3:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513487"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index 6a0beb9d877..9eaaa6c8668 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -109,11 +109,13 @@ grisou-30:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e522faf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 83da72d4f3a..0ac2ef63915 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -109,11 +109,13 @@ grisou-31:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffa5b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 91d7943850a..be03dff8035 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -109,11 +109,13 @@ grisou-32:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43bdd3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index 0a605d55fca..a7488059440 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -109,11 +109,13 @@ grisou-33:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index 4845bca4ab1..7e6dcbe4110 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -109,11 +109,13 @@ grisou-34:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50129b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index e381731b1f8..df7bebdb689 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -109,11 +109,13 @@ grisou-35:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d963"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index 2d7bc2c23fd..7700bb926fa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -109,11 +109,13 @@ grisou-36:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51061b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index 65e9422141f..affcc2ad2a1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -109,11 +109,13 @@ grisou-37:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51395b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index ce080c93ae6..761d3939aff 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -109,11 +109,13 @@ grisou-38:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5105bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 20d6dedefb4..32bb126fd4c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -109,11 +109,13 @@ grisou-39:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e667"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index c7adbf1f85b..f398dd69fd6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -109,11 +109,13 @@ grisou-4:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510bff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 1a75726d391..7d57835d471 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -109,11 +109,13 @@ grisou-40:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513bcb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index 0dfc8dc4b0f..155a2264a28 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -109,11 +109,13 @@ grisou-41:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fcab"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index 9486cd1a73a..9f1629ef1ba 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -109,11 +109,13 @@ grisou-42:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5147bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 0a746ffc26f..72b3f7fb0b7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -109,11 +109,13 @@ grisou-43:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5110db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 9e6d3492b0a..c066271ee2b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -109,11 +109,13 @@ grisou-44:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51113f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index 488470e5d83..b03d5102622 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -109,11 +109,13 @@ grisou-45:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513663"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index c5ed60a6b06..3d5a51a5064 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -109,11 +109,13 @@ grisou-46:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501c8f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index afe262379c2..5779378aa85 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -109,11 +109,13 @@ grisou-47:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012b7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index 13a106e2bcd..c78a1508ae5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -109,11 +109,13 @@ grisou-48:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d16f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index 4a2ba7922fc..aecccf2709d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -108,11 +108,13 @@ grisou-49:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4396e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index df9a19ecb16..a74d937b1ab 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -109,11 +109,13 @@ grisou-5:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510b1b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index 98b857e273f..6efef23bba8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -120,11 +120,13 @@ grisou-50:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b17"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index a656893355e..9577f74ae52 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -120,11 +120,13 @@ grisou-51:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcd27"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index 2f3089476c6..1ff20b04213 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -109,11 +109,13 @@ grisou-6:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dc67"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index 698763956e3..92c1cb4af7a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -109,11 +109,13 @@ grisou-7:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index 27bab7a05e3..22c092d2bf2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -109,11 +109,13 @@ grisou-8:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510883"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index b4db394a537..9adc6827b59 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -109,11 +109,13 @@ grisou-9:
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51017f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros.yaml b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
index 4a4190a2cff..1e2827c5732 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
@@ -35,10 +35,8 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: SSD
         # model: PERC H330 Mini
       sdb:
         interface: SATA
-        storage: SSD
         # model: PERC H330 Mini
         reservation: true
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
index 4464e6be764..b9908d43c7d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -70,11 +70,13 @@ gros-1:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49235"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
index 405aac9d9b7..19b9e1d6335 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -70,11 +70,13 @@ gros-10:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49344"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
index aee62246627..e5e5ed5b9f2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -70,11 +70,13 @@ gros-100:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
index f10495348e6..fc34caa4817 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -70,11 +70,13 @@ gros-101:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4831f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
index 5af96811bfc..70d2f915f08 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -70,11 +70,13 @@ gros-102:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f72"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
index ee87510d379..2c0b90554f1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -70,11 +70,13 @@ gros-103:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f3f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
index 6a82d5e4b94..dc9a47cfe71 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -70,11 +70,13 @@ gros-104:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f94"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
index 1e27ab4ec77..f18dfd46342 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -70,11 +70,13 @@ gros-105:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483e5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
index 9bd40d4b259..c2a338faa08 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -70,11 +70,13 @@ gros-106:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48491"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
index 1c93eb22eb3..a356d37e2b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -70,11 +70,13 @@ gros-107:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48230"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
index e981cde5784..2755bc33b7f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -70,11 +70,13 @@ gros-108:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504cdc"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
index b6b213e6bc8..0f9a2c4fa51 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -70,11 +70,13 @@ gros-109:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4aa84"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
index aa08b9cae66..18dfd1d760e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -70,11 +70,13 @@ gros-11:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121503a68"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
index 6dc3f4c6ed5..e3a85a0ec9c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -70,11 +70,13 @@ gros-110:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab3e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
index c9eb709efe1..71fe0962710 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -70,11 +70,13 @@ gros-111:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac1c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
index c6d9d917ce2..5bdea2d6103 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -70,11 +70,13 @@ gros-112:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab50"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
index 7fd043c76ef..ae98a7eda03 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -70,11 +70,13 @@ gros-113:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4abfe"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
index 852eabe81b4..ee8b40cbcd1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -70,11 +70,13 @@ gros-114:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab04"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
index a7fbf305bb4..7f8908365f5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -70,11 +70,13 @@ gros-115:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48793"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
index d611f2ff6f7..75a0bbd9d82 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -70,11 +70,13 @@ gros-116:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a487ef"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
index 1507d34d0bf..bebd5dbf143 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -70,11 +70,13 @@ gros-117:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a488cd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
index 5c517172251..514ea411412 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -70,11 +70,13 @@ gros-118:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48e77"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
index 3d7558f000f..00f7d6f4096 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -70,11 +70,13 @@ gros-119:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a24"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
index 21441d06159..af057a11369 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -70,11 +70,13 @@ gros-12:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492e5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
index 8fc8f10a4e3..be2948e5a11 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -70,11 +70,13 @@ gros-120:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a03"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
index f7883c84f67..5d7a91e3670 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -70,11 +70,13 @@ gros-121:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a56"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
index 1560e95c966..7c722dddbc6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -70,11 +70,13 @@ gros-122:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a489b4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
index 8768c117950..96876bed282 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -70,11 +70,13 @@ gros-123:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48eab"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
index 45735e2a2a4..d30dac0ad12 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -70,11 +70,13 @@ gros-124:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a02"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
index 69c89a2ad2b..025b0adf39d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -70,11 +70,13 @@ gros-13:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215033c4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
index c22cb05029a..2b4719b6369 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -70,11 +70,13 @@ gros-14:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49251"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
index baf1bd360cc..cad0ba3eae1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -70,11 +70,13 @@ gros-15:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a490ec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
index 6e1ff3242ab..ec56a7e445e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -70,11 +70,13 @@ gros-16:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f76"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
index 5f30acee5f4..5023926b30c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -70,11 +70,13 @@ gros-17:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47fa2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
index f69f11a1ac5..0683ac07d0c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -70,11 +70,13 @@ gros-18:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48215"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
index 0a5271a292d..b6ec4cd2295 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -70,11 +70,13 @@ gros-19:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47eab"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
index 51f8a028493..636d152578d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -70,11 +70,13 @@ gros-2:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49089"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
index 8bf0fd547a2..ca42f537b1c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -70,11 +70,13 @@ gros-20:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f3e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
index 6a28ef801c5..a1dd4cde92e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -70,11 +70,13 @@ gros-21:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b5b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
index d631ae04bab..9fc2c287c02 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -70,11 +70,13 @@ gros-22:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215042ac"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
index 5ab39ce1133..1939555bd0b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -70,11 +70,13 @@ gros-23:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4abec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
index 4361c201bf2..c53871902b0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -70,11 +70,13 @@ gros-24:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215040bb"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
index 9126b4a680f..ca84c958d30 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -70,11 +70,13 @@ gros-25:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b66"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
index 29d4f8ab066..b72acd14838 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -70,11 +70,13 @@ gros-26:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49a43"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
index 1055cab54c9..018f938021b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -70,11 +70,13 @@ gros-27:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49aa6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
index 1493d5bf96a..ccc331b6e48 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -70,11 +70,13 @@ gros-28:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49a3a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
index e0b200198ab..4d94e8bca46 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -70,11 +70,13 @@ gros-29:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509965"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
index 421d2defecc..0d19a495c95 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -70,11 +70,13 @@ gros-3:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad83"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
index fb6305079b1..dc7ecc49eff 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -70,11 +70,13 @@ gros-30:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b6c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
index 74318ca5660..252aceb5f01 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -70,11 +70,13 @@ gros-31:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ab2b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
index fbea18d12e4..4fbd304a2c3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -70,11 +70,13 @@ gros-32:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac80"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
index 97ecf878bbb..3e7115575ee 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -70,11 +70,13 @@ gros-33:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48327"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
index 275ac92528e..a98ec6e6a25 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -70,11 +70,13 @@ gros-34:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48249"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
index b5b2e40f3bb..417f17667a0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -70,11 +70,13 @@ gros-35:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
index b13f726e787..ad58218f3af 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -70,11 +70,13 @@ gros-36:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
index 9465dea3fef..e2771940cff 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -70,11 +70,13 @@ gros-37:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4831e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
index 0462ee5087a..89228054886 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -70,11 +70,13 @@ gros-38:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48ed6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
index b16247e8455..2eb8223c83a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -70,11 +70,13 @@ gros-39:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a488ce"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
index f74b9028ec0..a9550c88216 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -70,11 +70,13 @@ gros-4:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a4e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
index f831fe3eafa..fa686e207cf 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -70,11 +70,13 @@ gros-40:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48eb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
index 7e70213420a..f3f031da3e8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -70,11 +70,13 @@ gros-41:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215099a6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
index 4b78440ab30..fb6bcebb83c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -70,11 +70,13 @@ gros-42:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b99"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
index a3dbae11154..157a68a3b45 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -70,11 +70,13 @@ gros-43:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49159"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
index e898360fc85..4e88662d1c8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -70,11 +70,13 @@ gros-44:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49160"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
index 71233069c55..eeeab6cde4a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -70,11 +70,13 @@ gros-45:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504ad1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
index d046f08c7b6..50278f4ca5b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -70,11 +70,13 @@ gros-46:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b81"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
index 089c5bdb9e9..563c49778cf 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -70,11 +70,13 @@ gros-47:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121503f48"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
index 3d6bd6cd1bd..e35b2dc1d84 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -70,11 +70,13 @@ gros-48:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49247"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
index b1462ff6d6b..e249aabf135 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -70,11 +70,13 @@ gros-49:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49146"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
index 77a7f25fd24..efa29ea8073 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -70,11 +70,13 @@ gros-5:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad4d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
index 188306c1d92..a507fed59e3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -70,11 +70,13 @@ gros-50:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4912f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
index b9b87532285..e41b2fdae2d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -70,11 +70,13 @@ gros-51:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4911f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
index c00f531ab2b..305b84a6d7b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -70,11 +70,13 @@ gros-52:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ac25"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
index a1ee4aabf42..1988dfb3c89 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -70,11 +70,13 @@ gros-53:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a489e0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
index 6e3346dd95b..1eeb6c31fd7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -70,11 +70,13 @@ gros-54:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4acb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
index bb7f21c25c4..519329b2495 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -70,11 +70,13 @@ gros-55:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49120"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
index 46c45f95032..148dcf4d0c4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -70,11 +70,13 @@ gros-56:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150439a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
index 5d2848298df..983b4aa0dc9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -70,11 +70,13 @@ gros-57:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215040c6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
index a8bbed4cebe..0b6330bfcd9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -70,11 +70,13 @@ gros-58:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150349d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
index 5cf9e8e0728..bd26eb7d211 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -70,11 +70,13 @@ gros-59:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504b08"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
index dff58790bda..42108311019 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -70,11 +70,13 @@ gros-6:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48e1b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
index f1fcb400590..05853ea6b13 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -70,11 +70,13 @@ gros-60:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492d4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
index 6f070f4e3c0..f9874c1c94f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -70,11 +70,13 @@ gros-61:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48430"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
index 654f35c396a..6649f70b19a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -70,11 +70,13 @@ gros-62:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48526"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
index 7298ec3afb1..9e599106e01 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -70,11 +70,13 @@ gros-63:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4847d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
index 395183c9dee..a921cf96c6e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -70,11 +70,13 @@ gros-64:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48ede"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
index f1a49311a2e..1451e1e0715 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -70,11 +70,13 @@ gros-65:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49332"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
index 5bbbc92fb87..3454dbf8844 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -70,11 +70,13 @@ gros-66:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a492ff"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
index 6e0d224c525..ffeb0cc8d97 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -70,11 +70,13 @@ gros-67:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49314"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
index 68fb322e0a4..85c40d30dc6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -70,11 +70,13 @@ gros-68:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x55cd2e41522c8439"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: XCV1DL67
       model: SSDSC2KG960G8R
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
index e35d1cb4cd6..c9ca7da5b8d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -70,11 +70,13 @@ gros-69:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48472"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
index 0223705899f..3b38607d3e0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -70,11 +70,13 @@ gros-7:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121504a75"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
index 9de7807146d..e18f0da0e30 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -70,11 +70,13 @@ gros-70:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48539"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
index baa3d7ae02d..1c340e3f090 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -70,11 +70,13 @@ gros-71:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483ad"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
index 7252732766b..b1158c6eaca 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -70,11 +70,13 @@ gros-72:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483d4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
index 32dcba32b9b..a1e20a9d1b2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -70,11 +70,13 @@ gros-73:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f82"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
index 98ad9f20f66..8a33d44d381 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -70,11 +70,13 @@ gros-74:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f40"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
index 4d0588de62e..68a2deb88f3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -70,11 +70,13 @@ gros-75:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4925d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
index e5d605743f7..face66d6716 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -70,11 +70,13 @@ gros-76:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49116"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
index 530783a6ad0..2d61aa424ab 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -70,11 +70,13 @@ gros-77:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509944"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
index fd4eeba57f5..9e429387d5d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -70,11 +70,13 @@ gros-78:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509956"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
index 21835d97f04..e9614e31b4e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -70,11 +70,13 @@ gros-79:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150991a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
index fc6e30e97f0..ded70a30aee 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -70,11 +70,13 @@ gros-8:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4929c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
index d0de0a9f903..dac593529e0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -70,11 +70,13 @@ gros-80:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a0751215099a3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
index 04ba45a2c03..315c88e1576 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -70,11 +70,13 @@ gros-81:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a49b74"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
index f62c3aadc8c..ae2e1751459 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -70,11 +70,13 @@ gros-82:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121509957"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
index 5d9c86f310d..b4db5cd2d3e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -70,11 +70,13 @@ gros-83:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f80"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
index 7eebba10819..aedcfa645ba 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -70,11 +70,13 @@ gros-84:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150349c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
index 14f16949622..ff2dc427f67 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -70,11 +70,13 @@ gros-85:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48820"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
index 0f2d0d9a22e..0e802ffee76 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -70,11 +70,13 @@ gros-86:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48a0a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
index e7e0ee00a10..adc7e71d82e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -70,11 +70,13 @@ gros-87:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad22"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
index 7b00f49889b..9f6551be77d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -70,11 +70,13 @@ gros-88:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4ad36"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
index 48451b6613a..cde0069d82b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -70,11 +70,13 @@ gros-89:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f88"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
index 2fb9fd2272d..5fb17cc91ae 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -70,11 +70,13 @@ gros-9:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a483dc"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
index d7eb0cf8421..c216a669db5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -70,11 +70,13 @@ gros-90:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47ecf"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
index f1e04db4f56..cafd8e51337 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -70,11 +70,13 @@ gros-91:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f3d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
index 54eeb1b6ffa..5f9051f30dc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -70,11 +70,13 @@ gros-92:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48f71"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
index db03f5f30c2..ca474d2deb2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -70,11 +70,13 @@ gros-93:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a48edd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
index fc540e43552..5165573cde8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -70,11 +70,13 @@ gros-94:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150344f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
index 8d1a08fd87f..c171425ae48 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -70,11 +70,13 @@ gros-95:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a482f8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
index 27f4265cce6..4e8c16835e6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -70,11 +70,13 @@ gros-96:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47e92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
index 5e2d7cf184f..81851b27e4b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -70,11 +70,13 @@ gros-97:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a47f92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
index 93c77b32020..f1c5eef3c08 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -70,11 +70,13 @@ gros-98:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a07512150407c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
index 0d246a8dc83..01a8c855af0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -70,11 +70,13 @@ gros-99:
       firmware_version: D1DF003
       model: MTFDDAK480TDN
       size: 480103981056
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075121a4823a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:1:0"
       firmware_version: D1DF003
       model: MTFDDAK960TDN
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
index 5be690ffea2..bc3333d0a0d 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
@@ -41,7 +41,5 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
       sdb:
         interface: SATA
-        storage: SSD
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
index 27c3761e7a4..1ce8b7e9024 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -104,11 +104,13 @@ grouille-1:
       firmware_version: B709
       model: KRM5XVUG1T92
       size: 1920383410176
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
       firmware_version: D3DJ004
       model: MTFDDAK960TDT
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
index 21b0d693721..8d5042421c4 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -104,11 +104,13 @@ grouille-2:
       firmware_version: B709
       model: KRM5XVUG1T92
       size: 1920383410176
+      storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
       firmware_version: D3DJ004
       model: MTFDDAK960TDT
       size: 960197124096
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue.yaml b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
index 94f3c031b3f..3972aa6ced9 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
@@ -40,7 +40,6 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
     gpu_devices:
       nvidia0:
         cores_affinity: 0 16 8 24 4 20 12 28
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
index 0f99419cf33..152fa953eff 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -120,5 +120,6 @@ grue-1:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
index 1109c245a58..57f2e2c3da8 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -120,5 +120,6 @@ grue-2:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
index bb301bacec2..554fef861ff 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -120,5 +120,6 @@ grue-3:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
index 7d2f9387517..2725d5aca4e 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -120,5 +120,6 @@ grue-4:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
index c2d3f5f205c..b90753f2cf4 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -120,5 +120,6 @@ grue-5:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
+      storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
index 3bbb56712e6..e7dccbaf9af 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
@@ -38,7 +38,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     monitoring:
       wattmeter: shared
       metric: power
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
index e6d532bfe01..2d5ed0ad361 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -81,5 +81,6 @@ grvingt-1:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
index 6995ca5f7a4..2d62935fc02 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -81,5 +81,6 @@ grvingt-10:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
index d554e104e19..167c8b9acaa 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -81,5 +81,6 @@ grvingt-11:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
index 4607b3caebe..b274acac7a6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -81,5 +81,6 @@ grvingt-12:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
index aed793ad7c7..b8266a130b3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -81,5 +81,6 @@ grvingt-13:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
index 86cb85ec651..b45f77c09ad 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -81,5 +81,6 @@ grvingt-14:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
index 9501527eda4..cb00b36fa96 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -81,5 +81,6 @@ grvingt-15:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
index 0e8af7e82ac..a2712226c5b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -81,5 +81,6 @@ grvingt-16:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
index dbcbb462ed2..c9b0ff45e99 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -81,5 +81,6 @@ grvingt-17:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
index 8877dbeef13..f497187c6a6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -81,5 +81,6 @@ grvingt-18:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
index f56720be716..4281a30a847 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -81,5 +81,6 @@ grvingt-19:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
index ebcc12b5b32..c020b48a0c8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -81,5 +81,6 @@ grvingt-2:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
index 22aac45aeb9..165e0a801f2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -81,5 +81,6 @@ grvingt-20:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
index 3c5b5a12dc7..f6c9ea59653 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -81,5 +81,6 @@ grvingt-21:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
index a54ddecce3e..8e9280310af 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -81,5 +81,6 @@ grvingt-22:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
index ccd61b8b041..fcdfb379db8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -81,5 +81,6 @@ grvingt-23:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
index 6f455adc06b..4f4a88692e8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -81,5 +81,6 @@ grvingt-24:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
index 63ba9e610ce..ee7bdddaaa0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -81,5 +81,6 @@ grvingt-25:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
index dbc1b68f79c..44961e44dcd 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -81,5 +81,6 @@ grvingt-26:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
index e761298a052..d398775ae20 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -81,5 +81,6 @@ grvingt-27:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
index 29c21ce546b..f883bc0cac2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -81,5 +81,6 @@ grvingt-28:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
index ef27921586d..95157648ea5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -81,5 +81,6 @@ grvingt-29:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
index 5ab4db0dc06..7cfe507a554 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -81,5 +81,6 @@ grvingt-3:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
index 6dd781afc0a..1c1d33fdf0b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -81,5 +81,6 @@ grvingt-30:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
index 8f8d3cc3a4f..658968c24c1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -81,5 +81,6 @@ grvingt-31:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
index a07814fbbce..5c507a48ed7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -81,5 +81,6 @@ grvingt-32:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
index cc7954d3e9f..10ec0311ccd 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -81,5 +81,6 @@ grvingt-33:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
index d34b628b663..e2c11b1f64b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -81,5 +81,6 @@ grvingt-34:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
index 52f67b7e273..28878f3c0d5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -81,5 +81,6 @@ grvingt-35:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
index cfee583dc1c..4cf8a4573e3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -81,5 +81,6 @@ grvingt-36:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
index 425f989652a..64eeb46114f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -81,5 +81,6 @@ grvingt-37:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
index 9d6cd410a46..e1c1668de84 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -81,5 +81,6 @@ grvingt-38:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
index 7c4aad18a8a..4d3aad5ef1b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -81,5 +81,6 @@ grvingt-39:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
index eb4e24cd32f..4e788321c12 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -81,5 +81,6 @@ grvingt-4:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
index ea3c0dcbd5c..4939c4c99c2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -81,5 +81,6 @@ grvingt-40:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
index 2e4758272fb..ed6878a7eab 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -81,5 +81,6 @@ grvingt-41:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
index 17a75d63aec..e2cbcdef477 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -81,5 +81,6 @@ grvingt-42:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
index e730d2f0dfc..f9158ecdc9d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -81,5 +81,6 @@ grvingt-43:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
index 1d370be1583..105afb6b4ab 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -81,5 +81,6 @@ grvingt-44:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
index fe917aa75ce..c2475f7633a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -81,5 +81,6 @@ grvingt-45:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
index e6ede54350c..749e4b83752 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -81,5 +81,6 @@ grvingt-46:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
index 9afefde39ef..7a2e1778b1e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -81,5 +81,6 @@ grvingt-47:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
index 5707b8fcde6..e49f0d7ff04 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -81,5 +81,6 @@ grvingt-48:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
index 7e0f69fd93f..c22e54e28df 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -81,5 +81,6 @@ grvingt-49:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
index daef059b35e..e9ac11232f0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -81,5 +81,6 @@ grvingt-5:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
index 57c6ffcd3bc..3fc847c8111 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -81,5 +81,6 @@ grvingt-50:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
index 9bd1d4e2168..d4cb84e6ea1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -81,5 +81,6 @@ grvingt-51:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
index 6ca8232ea0a..f62eb2ad24c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -81,5 +81,6 @@ grvingt-52:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
index 0555dc5a209..5669c94f92a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -81,5 +81,6 @@ grvingt-53:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
index 56af211a86d..4c32742ef9a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -81,5 +81,6 @@ grvingt-54:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
index 526883543a8..295f4eac95c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -81,5 +81,6 @@ grvingt-55:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
index d8ca66bc36f..08411592d5f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -81,5 +81,6 @@ grvingt-56:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
index 3fe8ac2fbd6..9f7862160d6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -81,5 +81,6 @@ grvingt-57:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
index 2b82f6dac9c..d737b1e0837 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -81,5 +81,6 @@ grvingt-58:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
index be2e6ae7e94..49b1b58827e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -81,5 +81,6 @@ grvingt-59:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
index ac71f7ce83c..4a208c2cf6d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -81,5 +81,6 @@ grvingt-6:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
index d32279fd8e9..76ed64ef5be 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -81,5 +81,6 @@ grvingt-60:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
index 6da51c21e39..901ba654487 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -81,5 +81,6 @@ grvingt-61:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
index c014f1fc066..6c64376fb1f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -81,5 +81,6 @@ grvingt-62:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
index 81a4dbaa9e7..c6782714bb7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -81,5 +81,6 @@ grvingt-63:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
index 8cc1425730f..62795814bf8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -81,5 +81,6 @@ grvingt-64:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
index 3776c54a31e..8112539be24 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -81,5 +81,6 @@ grvingt-7:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
index da939c8546b..1beff8b2ff6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -81,5 +81,6 @@ grvingt-8:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
index 61473029f5b..b3bb12f3d5d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -81,5 +81,6 @@ grvingt-9:
       firmware_version: NB33
       model: ST1000NX0443
       size: 1000204886016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index 428dc66aef8..13a6f307118 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -20,7 +20,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index de09dd381b2..ce7c2a32f89 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -87,5 +87,6 @@ econome-1:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index 6f5750b487b..9b6c27edd97 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -87,5 +87,6 @@ econome-10:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index 31b54182e7d..5cdb2f973d4 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -87,5 +87,6 @@ econome-11:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index d11f62fa959..463540e33bd 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -87,5 +87,6 @@ econome-12:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index c83f5c85da2..fe3c17869ac 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -87,5 +87,6 @@ econome-13:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index f34c627ed81..1d558ebbd0a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -87,5 +87,6 @@ econome-14:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index a16dedbda3f..51ab8065894 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -88,5 +88,6 @@ econome-15:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 1d7c9516a83..7eeb99c570f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -87,5 +87,6 @@ econome-16:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index 4effec14f1b..464d2dae58a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -87,5 +87,6 @@ econome-17:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index 6fb856337af..d932b04aca5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -87,5 +87,6 @@ econome-18:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index 2d5bf676197..6b19f214e41 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -87,5 +87,6 @@ econome-19:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index 5c3a634fe94..b866a28851e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -87,5 +87,6 @@ econome-2:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index ab838d5883c..196b543b06c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -87,5 +87,6 @@ econome-20:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index fdba8201d64..6845f71d200 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -87,5 +87,6 @@ econome-21:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index 035a00a4e69..0359dd57d2c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -87,5 +87,6 @@ econome-22:
       firmware_version: 01.01D06
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index b95bcaa4e11..d21b1ebdf70 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -87,5 +87,6 @@ econome-3:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 8a6dbef0041..76f9c809ec5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -87,5 +87,6 @@ econome-4:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 36ad503ab6c..99b7578b736 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -87,5 +87,6 @@ econome-5:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index 79eb27d79d3..f25cc10ae5e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -87,5 +87,6 @@ econome-6:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index 7b5b69cd2c0..784ab2d533d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -87,5 +87,6 @@ econome-7:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 28679a0214a..323b2ac811f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -87,5 +87,6 @@ econome-8:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index af08860e948..520f88c8723 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -87,5 +87,6 @@ econome-9:
       firmware_version: 01.01D05
       model: WDC WD2003FYYS-1
       size: 2000398934016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
index 72f99b75d15..efa23864559 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
@@ -44,4 +44,3 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: SSD
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
index 2e4c96e854e..f8beb8700a9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -88,5 +88,6 @@ ecotype-1:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
index af6f1a6226a..b44655b85e9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -88,5 +88,6 @@ ecotype-10:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
index 9b4784e8c2a..0f8cc810a2e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -88,5 +88,6 @@ ecotype-11:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
index 2e3629d940b..e8b3d886ce4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -88,5 +88,6 @@ ecotype-12:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
index c0c92a1be9e..e719254b59c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -88,5 +88,6 @@ ecotype-13:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
index 23ac5ceeffe..97bd7c3e466 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -88,5 +88,6 @@ ecotype-14:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
index b362080c9c8..b9ec78f1779 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -88,5 +88,6 @@ ecotype-15:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
index 6ee55c9d703..97e3ac1e755 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -88,5 +88,6 @@ ecotype-16:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
index e44dfd844ca..8ebec698ffd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -88,5 +88,6 @@ ecotype-17:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
index b7648ebce8c..81a3035a4a8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -88,5 +88,6 @@ ecotype-18:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
index dfa733e329a..4215a95f552 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -88,5 +88,6 @@ ecotype-19:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
index 52fc06cef28..d348a169bae 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -88,5 +88,6 @@ ecotype-2:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
index fdc7266bca0..c4bcb69b2d5 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -88,5 +88,6 @@ ecotype-20:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
index 61ba2f4b9bb..3501ab1a31e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -88,5 +88,6 @@ ecotype-21:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
index 1fefa7e02c4..2e7d9bb628c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -88,5 +88,6 @@ ecotype-22:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
index 7d0208b6ef3..63adcd821a2 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -88,5 +88,6 @@ ecotype-23:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
index dde040fe6a7..a7073e4364f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -88,5 +88,6 @@ ecotype-24:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
index 7ccca0eaccd..da6a7b6b5da 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -88,5 +88,6 @@ ecotype-25:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
index 85a682322a8..be6f1ce3e18 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -88,5 +88,6 @@ ecotype-26:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
index caae84a2557..a5186a9c73d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -88,5 +88,6 @@ ecotype-27:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
index c64654ecbfe..4a0c609aeea 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -88,5 +88,6 @@ ecotype-28:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
index bd2bc694a83..2a642b18004 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -88,5 +88,6 @@ ecotype-29:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
index 5fec4e12d4d..66248d728d1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -88,5 +88,6 @@ ecotype-3:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
index 4c7d9054cc6..bf1437976df 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -88,5 +88,6 @@ ecotype-30:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
index f2e55e696bd..28d6eb842a1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -88,5 +88,6 @@ ecotype-31:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
index 012849f24ef..41d355937cb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -88,5 +88,6 @@ ecotype-32:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
index a301a016685..ed2514e9a0c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -88,5 +88,6 @@ ecotype-33:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
index b808fb4ca27..3384a4ede03 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -88,5 +88,6 @@ ecotype-34:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
index 2240f3cb941..2cfdd0d00ac 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -88,5 +88,6 @@ ecotype-35:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
index 5586d4adea1..8e5433734c9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -88,5 +88,6 @@ ecotype-36:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
index ce897ba363d..6d89d30baaf 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -88,5 +88,6 @@ ecotype-37:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
index f634c0ecfab..bd5d0bb3697 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -88,5 +88,6 @@ ecotype-38:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
index 8741e1d40ef..dac9444d2a1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -88,5 +88,6 @@ ecotype-39:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
index d01ef8fe66f..5fd71aa0fe2 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -88,5 +88,6 @@ ecotype-4:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
index 105f2512955..bb739664198 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -88,5 +88,6 @@ ecotype-40:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
index e28ee4e95df..181eaca073f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -88,5 +88,6 @@ ecotype-41:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
index 386fa89d3b2..8e1d2748594 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -88,5 +88,6 @@ ecotype-42:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
index 5f1d7850508..5b8734bd3d0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -88,5 +88,6 @@ ecotype-43:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
index 755603c194e..851c6640630 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -88,5 +88,6 @@ ecotype-44:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
index 4493902eedd..0855df5837b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -88,5 +88,6 @@ ecotype-45:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
index 3d1ee4d9c3f..6a0ac13f3cc 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -88,5 +88,6 @@ ecotype-46:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
index 41362ddf0b8..b28d4bf4909 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -88,5 +88,6 @@ ecotype-47:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
index 42c9874f243..4fb8518bba6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -88,5 +88,6 @@ ecotype-48:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
index e68c73e5395..fa58033e116 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -88,5 +88,6 @@ ecotype-5:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
index f377451c939..26663729a2b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -88,5 +88,6 @@ ecotype-6:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
index e9d1d662255..c5e6826a5af 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -88,5 +88,6 @@ ecotype-7:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
index 6b588baa7d0..f0b717d953e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -88,5 +88,6 @@ ecotype-8:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
index b115d242e06..fe59f0c2d97 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -88,5 +88,6 @@ ecotype-9:
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 4ff58487249..b30c8c73da3 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -89,29 +89,34 @@ paranoia-1:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df100c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0970"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288cdc8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e114"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index 6603b97a136..3bbc43b1706 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -89,29 +89,34 @@ paranoia-2:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df0b5c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c03ac"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df128c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0d98"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index 8b47d26a442..fb1c60fd8f4 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -89,29 +89,34 @@ paranoia-3:
       firmware_version: D1P3
       model: WD6002BKTG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288d35c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e3b8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0c30"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022c0804"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index 4c88ead90f8..e7a2603ec00 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -89,29 +89,34 @@ paranoia-4:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022be9ac"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0289bfa0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022cebec"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50014ee7003f5cd0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1P3
       model: WD6002BKTG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index d26b8c520f7..9ff1178bcaa 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -89,29 +89,34 @@ paranoia-5:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bfda0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02deed90"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02deed1c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022be3e0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index a52f15044fc..01c15545133 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -89,29 +89,34 @@ paranoia-6:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df1a74"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e394"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df09a0"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02ded270"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index a7cb03f2f52..899daae7b85 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -89,29 +89,34 @@ paranoia-7:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288c72c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02def9dc"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02dee7bc"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df07a4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index 3666dcb5e46..a5d66c554b9 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -89,29 +89,34 @@ paranoia-8:
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288d158"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy1-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e160"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy2-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df076c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy3-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df06e8"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy4-lun-0"
       firmware_version: D1S6
       model: WD6001BKHG
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index a6e5a5c24ff..0f7accc9d7b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -20,27 +20,22 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk0
       sdb:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk1
       sdc:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk2
       sdd:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk3
       sde:
         unstable_device_name: true
         interface: SAS
-        storage: HDD
         symlink: /dev/disk/by-slot/disk4
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index 21cfa0a93f6..a6a0bec0665 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -92,5 +92,6 @@ parapide-1:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index 103926cb5e3..438de1931d4 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -92,5 +92,6 @@ parapide-10:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index 55c2f38bf14..a190fc8aec5 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -92,5 +92,6 @@ parapide-12:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index b410ebd2c9e..e3b41951c1b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -92,5 +92,6 @@ parapide-13:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index 25660c789b8..65da0287124 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -92,5 +92,6 @@ parapide-16:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index ebfdcce838a..211f487e139 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -92,5 +92,6 @@ parapide-18:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index 4eb613c1436..c6c008639be 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -92,5 +92,6 @@ parapide-19:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 1b372ff3d06..34849bab1a8 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -92,5 +92,6 @@ parapide-2:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index 92ed16235b9..b4a1c9483e7 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -92,5 +92,6 @@ parapide-21:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index c60d9b7f605..44d3f3c8434 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -92,5 +92,6 @@ parapide-24:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index 1776dbea16d..0704bd7a27b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -92,5 +92,6 @@ parapide-25:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index 843e5d8f4e7..343a639f40a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -92,5 +92,6 @@ parapide-3:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index 691e9511307..ea3a320c5b7 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -92,5 +92,6 @@ parapide-5:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index c97a975e4c3..624f2f6ff8a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -92,5 +92,6 @@ parapide-6:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index 5be24608b62..291be8c3c6c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -92,5 +92,6 @@ parapide-7:
       firmware_version: GK6OAC4A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index bad199c3ecc..fb8b853ca95 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -92,5 +92,6 @@ parapide-8:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index 0bcedb12cc1..44aef8ba103 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -92,5 +92,6 @@ parapide-9:
       firmware_version: GK6OAC5A
       model: HITACHI HUA7250S
       size: 500107862016
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index e777205df7d..9f2ea906fa3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -36,7 +36,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index 7808c2c2204..739ed1a6580 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -111,5 +111,6 @@ parapluie-1:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index d9f34b70ec4..70dd690c3a8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -111,5 +111,6 @@ parapluie-11:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 4c02998e85a..b0a4e7ec61a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -111,5 +111,6 @@ parapluie-12:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index 6afeb6ea73f..b3ff20df82e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -111,5 +111,6 @@ parapluie-15:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index febb0d07917..430fdb4f767 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -111,5 +111,6 @@ parapluie-19:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index d4b66489445..d6fe40d3956 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -111,5 +111,6 @@ parapluie-2:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index 95642f5f467..66f010b13b3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -111,5 +111,6 @@ parapluie-20:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 59c6eab43ca..01d0fb39cb7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -111,5 +111,6 @@ parapluie-21:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index 3d03d386fb5..00b9438effc 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -111,5 +111,6 @@ parapluie-22:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index 74aa7886c56..c6544e0e493 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -111,5 +111,6 @@ parapluie-25:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index 07f5fbb6907..ba692c769ad 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -111,5 +111,6 @@ parapluie-28:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index f44bbc6cd4b..e02f6ba0b55 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -111,5 +111,6 @@ parapluie-31:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index e32fcb7dabb..f47ae4be184 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -111,5 +111,6 @@ parapluie-32:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
index 86467af21e8..ccaa53ebdd8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -111,5 +111,6 @@ parapluie-35:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index 734b0693706..a5184119f8e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -111,5 +111,6 @@ parapluie-38:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index 6b7ba0c53b7..c740ec90384 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -111,5 +111,6 @@ parapluie-9:
       firmware_version: HPG0
       model: VB0250EAVER
       size: 250059350016
+      storage: HDD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index 50c87320482..4223efb03a5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -20,7 +20,6 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
     network_adapters:
       eth0:
         enabled: false
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index cd6031fc596..6c884bb606f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -88,35 +88,41 @@ parasilo-1:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4abf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b3b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaaf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece7a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0444"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 472cc5b88ef..27f6a985b5b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -88,35 +88,41 @@ parasilo-10:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece93b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed38cb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece58b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed39bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0440"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index f69a1c3515e..1a7f2bcd53e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -88,35 +88,41 @@ parasilo-11:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed330f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea138f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed25bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4bf7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0434"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index 4e38d2a2d6b..ffa51980ee3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -88,35 +88,41 @@ parasilo-12:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2183"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf31b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4d2b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3e5b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0448"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index 1a204678f3e..ed401c63c39 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -88,35 +88,41 @@ parasilo-13:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaef"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5757"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5743"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x50000399b850bdad"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: EF05
       model: AL15SEB060NY
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0428"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index 173d0e501e6..b882062e9af 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -88,35 +88,41 @@ parasilo-14:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6203"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4b47"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9e10b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0418"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index cd529f9acc6..30404311235 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -88,35 +88,41 @@ parasilo-15:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed53b7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2987"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5473"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a045c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index 4bc914d3218..db51fc83888 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -88,35 +88,41 @@ parasilo-16:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c4367"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c6c3b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5c2b63"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f599d83"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003960c8a50d0"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index 919b2bcbd6c..4f3cfc159de 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -88,35 +88,41 @@ parasilo-17:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eeb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf927"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed58a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe5f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0414"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index 3ff5d31dec6..f5892906367 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -88,35 +88,41 @@ parasilo-18:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4973"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb850b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea04a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0cc3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0474"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index f49f60242f7..59fd105a6a6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -88,35 +88,41 @@ parasilo-19:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece23f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed576b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3927"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa2b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0410"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index efb1d9113cc..682d5496d3e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -88,35 +88,41 @@ parasilo-2:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4caf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2c57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed21c7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f4b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0424"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index f311a657ea1..f4cbc7dc756 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -88,35 +88,41 @@ parasilo-20:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa17"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed545f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4dcf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4c87"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0488"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index f9aaba28bfe..cad41d18eec 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -88,35 +88,41 @@ parasilo-21:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5747"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed20e7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecea1f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed52b3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0454"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 06080726c21..07a3245b362 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -88,35 +88,41 @@ parasilo-22:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf97b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecec93"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2273"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf603"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0450"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index f9e79fff5a8..f874a24660e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -88,35 +88,41 @@ parasilo-23:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2bff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4937"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea47f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0e53"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a044c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index 3c28131fb87..a77aa09a6b4 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -88,35 +88,41 @@ parasilo-24:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6ca7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb93bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7143"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea041f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0460"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 149affb6ed7..45c8f747d12 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -88,35 +88,41 @@ parasilo-25:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb964f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5009f30f6bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: VT33
       model: ST600MP0005
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fdff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a27"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0464"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index fd7d180d31f..775bcca48c0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -88,35 +88,41 @@ parasilo-26:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf353"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5467"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed527b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed511b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a048c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index ee2d47992d5..33b08927b6f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -88,35 +88,41 @@ parasilo-27:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecdef7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5573"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed226b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed579b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a06f4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index 002598accc3..ed3ae746a3e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -88,35 +88,41 @@ parasilo-28:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5193"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0b1b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7053"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4f87"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0468"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index 9e285cd7780..c9bf53e4d72 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -88,35 +88,41 @@ parasilo-3:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b0f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ececbb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87f7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3d8f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0498"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index 27bef55336b..17b6e99af58 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -88,35 +88,41 @@ parasilo-4:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece5b7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b47"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4847"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf913"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0490"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index 7f374c370b6..40e6772b6a7 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -88,35 +88,41 @@ parasilo-5:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5587"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3283"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2eeb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3183"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0458"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index 198f134b090..d45605671d2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -88,35 +88,41 @@ parasilo-6:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed570f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed466b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed29a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003973c889ab1"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: AM07
       model: PX04SHB020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index 6ce471f9421..f3ed67db4be 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -88,35 +88,41 @@ parasilo-7:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5597"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf0cb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece9f3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece66b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0438"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index e7b5eb86506..9da996231a3 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -88,35 +88,41 @@ parasilo-8:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafca7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2a9b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ca3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed22b3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a043c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 99b7295b8ee..6a06e124d59 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -88,35 +88,41 @@ parasilo-9:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2693"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed219b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed30ff"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb778f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a041c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
+      storage: SSD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index ac3702beb70..c6bd45f0920 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -20,26 +20,20 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
         reservation: true
       sdc:
         interface: SAS
-        storage: HDD
         reservation: true
       sdd:
         interface: SAS
-        storage: HDD
         reservation: true
       sde:
         interface: SAS
-        storage: HDD
         reservation: true
       sdf:
         interface: SAS
-        storage: SSD
         reservation: true
     network_adapters:
       eth0:
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index a6c6a96386d..ddc084a1c8d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -88,11 +88,13 @@ paravance-1:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8577"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index c7d768989e5..fac38eed767 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -88,11 +88,13 @@ paravance-10:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f8b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index b158ad42dc5..307f6248191 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -88,11 +88,13 @@ paravance-11:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea738f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index df549285cb9..92c5842ff63 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -88,11 +88,13 @@ paravance-12:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafe1b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index 71b5f908626..27fd4952488 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -88,11 +88,13 @@ paravance-13:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4923"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index be44e23620c..71943608e21 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -88,11 +88,13 @@ paravance-14:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eac923"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index d723f79547e..64febc3eb08 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -88,11 +88,13 @@ paravance-15:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb47c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index b9636f62665..bd3e0a6ef63 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -88,11 +88,13 @@ paravance-16:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2687"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index 9aad3d8feed..b73e1c077b8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -88,11 +88,13 @@ paravance-17:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8893"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index de194876e79..3e703dbcbd6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -88,11 +88,13 @@ paravance-18:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb470b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index 819b9dff885..032878c2810 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -88,11 +88,13 @@ paravance-19:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2acf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index 0c78c028700..03ee8db7078 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -88,11 +88,13 @@ paravance-2:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea29a3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index c0810c17a3b..257f66f895f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -88,11 +88,13 @@ paravance-20:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb762f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index 95a7bd6583e..11465d312c2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -88,11 +88,13 @@ paravance-21:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e8343bf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index e6d76774334..33982d46e80 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -88,11 +88,13 @@ paravance-22:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d847"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 800ceb20031..724e39ca533 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -88,11 +88,13 @@ paravance-23:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5833"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index 254c4aa2a9e..9173926e975 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -88,11 +88,13 @@ paravance-24:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a53"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index 7a9e548b896..6d18584933a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -88,11 +88,13 @@ paravance-25:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf5fb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index c44cbc63115..f862f188307 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -88,11 +88,13 @@ paravance-26:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed57cf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index 339b4e34f69..241fa35a34d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -88,11 +88,13 @@ paravance-27:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb577b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index fbdb067fa51..54215383a8c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -88,11 +88,13 @@ paravance-28:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4a83"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index af703df8a41..696c6240660 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -88,11 +88,13 @@ paravance-29:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5703"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index 4798b56398b..1b00c29aa36 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -88,11 +88,13 @@ paravance-3:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7233"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
index b82dc83a626..af32a6d611c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -88,11 +88,13 @@ paravance-30:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8ee3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index 85fc7aa87d7..5ce55b20669 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -88,11 +88,13 @@ paravance-31:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb25a7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index 282a2e3ee12..aced33aac48 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -88,11 +88,13 @@ paravance-32:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea1343"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index ab617372b25..9c5838d387f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -88,11 +88,13 @@ paravance-33:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ac3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index da56367081b..42d3c3dd9b5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -88,11 +88,13 @@ paravance-34:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea85f7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
index fc1e086938c..d486267d119 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -88,11 +88,13 @@ paravance-35:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54e3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index 91cb94bce90..edec03053be 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -88,11 +88,13 @@ paravance-36:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3047"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index 6819264e3c2..536e41fdcbf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -88,11 +88,13 @@ paravance-37:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87cf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index bce94b8e9a7..7791c1d045e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -88,11 +88,13 @@ paravance-38:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb010b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index 2d8444e0c54..4a7d8c67837 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -88,11 +88,13 @@ paravance-39:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead217"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index d386f5d5a47..432f16a2273 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -88,11 +88,13 @@ paravance-4:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea08bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index 3e2a9f88e0d..5b68a7f8842 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -88,11 +88,13 @@ paravance-40:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7717"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index 8defe3dc5bf..f52be597396 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -88,11 +88,13 @@ paravance-41:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0323"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index 5b17fa103fe..5a6f7fd63ad 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -88,11 +88,13 @@ paravance-42:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6d47"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 626633e5326..9f6d1b55c79 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -88,11 +88,13 @@ paravance-43:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9baf"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index 2b46db2697c..933b50cf566 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -88,11 +88,13 @@ paravance-44:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0dfb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 8f8349d9459..4f4c99b6308 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -88,11 +88,13 @@ paravance-45:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb72c3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index 55e45002ef9..3dad5d135c6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -88,11 +88,13 @@ paravance-46:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eacc33"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index 9fa21af534f..a7d1fb1e8d7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -88,11 +88,13 @@ paravance-47:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed580f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index bb34cd7bb40..8f71673fd8f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -88,11 +88,13 @@ paravance-48:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7a7b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index 9926de704c3..815c6edd9d1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -88,11 +88,13 @@ paravance-49:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fbb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index 0eaa6212622..1eb2b6952de 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -88,11 +88,13 @@ paravance-5:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc07"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index d2638b842c4..697250fb8ed 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -88,11 +88,13 @@ paravance-50:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6af7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index 133a6b1c255..8129d2cb557 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -88,11 +88,13 @@ paravance-51:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb1717"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 2d79c006140..f1a4bb66d9d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -88,11 +88,13 @@ paravance-52:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fa7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index c63d71f6d46..5357b4a437c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -88,11 +88,13 @@ paravance-53:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed481f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index cd0714f903a..b1dd020778c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -88,11 +88,13 @@ paravance-54:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9ef77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index 0a3eec111a3..d63389a721d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -88,11 +88,13 @@ paravance-55:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4ceb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index 1ad74306383..8011bd3c947 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -88,11 +88,13 @@ paravance-56:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8057"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index cbf18ca6b08..3ae31933ab4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -88,11 +88,13 @@ paravance-57:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc23"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index a28da29d816..09676a5d24c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -88,11 +88,13 @@ paravance-58:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d8af"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index c57f2f657f0..ed0d460f294 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -88,11 +88,13 @@ paravance-59:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf54f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
index 7c9ce3616c6..c59cfe0a8be 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -88,11 +88,13 @@ paravance-6:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb79bb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index d321f1ffda8..abc3812a15c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -88,11 +88,13 @@ paravance-60:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0767"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index ee9aafb6dfc..e5191a30bdc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -88,11 +88,13 @@ paravance-61:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb509f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index 06b1209d6b4..51c7f381052 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -88,11 +88,13 @@ paravance-62:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4b4b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index 8a4ca118532..40f3cf47655 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -88,11 +88,13 @@ paravance-63:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5dd3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 42704fd6a4b..a5f0da8d9f1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -88,11 +88,13 @@ paravance-64:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7977"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index 623224b704b..48d8d1d3fe7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -88,11 +88,13 @@ paravance-65:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8797"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index 69145151d23..e68c2880b5e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -88,11 +88,13 @@ paravance-66:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed593b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 16c27ca5d5c..e8d6f9e9465 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -88,11 +88,13 @@ paravance-67:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4a2b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index d9cb822c79c..64e6732b933 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -88,11 +88,13 @@ paravance-68:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4857"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index 33218cf3f0d..41efa236e5e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -88,11 +88,13 @@ paravance-69:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb733f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index 9aa3fc78865..8e7a7c2bffb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -88,11 +88,13 @@ paravance-7:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eaafe3"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index 01de2d7e681..97841e81b08 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -88,11 +88,13 @@ paravance-70:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46f7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index 80b90e44591..f4954de24c0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -88,11 +88,13 @@ paravance-71:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8fc7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index d8836ba29a9..11f1d862f2b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -88,11 +88,13 @@ paravance-72:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabb77"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index 05dc2e8beaf..d7d3260684a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -88,11 +88,13 @@ paravance-8:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8003"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index 05ae428267b..3ae355dbfbd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -88,11 +88,13 @@ paravance-9:
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9c67"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
       model: ST600MM0006
       size: 600127266816
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index 9a491b03311..359ece83bf2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -20,10 +20,8 @@ nodes:
     storage_devices:
       sda:
         interface: SAS
-        storage: HDD
       sdb:
         interface: SAS
-        storage: HDD
     network_adapters:
       eth0:
         enabled: true
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
index 6c8bec2c00a..f1b94bedf5f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -92,5 +92,6 @@ uvb-1:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
index 8f46e00adc6..43f29dae31e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -92,5 +92,6 @@ uvb-10:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
index e2174872011..cb2de1e5713 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -92,5 +92,6 @@ uvb-11:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
index 1831d92c365..c151ec6b286 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -92,5 +92,6 @@ uvb-12:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
index 8b3810f2494..7159d2d9819 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -92,5 +92,6 @@ uvb-14:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
index c18f524ca13..79980061dbb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
@@ -92,5 +92,6 @@ uvb-15:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
index cf6ee43ee42..9baeb6511f8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -92,5 +92,6 @@ uvb-16:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
index 31f5a43fcba..ab5f56b8e2e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -92,5 +92,6 @@ uvb-17:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
index 1726b62e774..30f1047a981 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -92,5 +92,6 @@ uvb-18:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
index fc1a13cbeda..375747fba17 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
@@ -92,5 +92,6 @@ uvb-19:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
index 4cf9dc1e5d0..a83b6797862 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -92,5 +92,6 @@ uvb-2:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
index 3df8296ecd5..6e4aa1eb3de 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
@@ -92,5 +92,6 @@ uvb-20:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
index 9e3f959fcc5..43a3ce9c6ed 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
@@ -92,5 +92,6 @@ uvb-21:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
index 89ef4247173..6f9f80550bc 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
@@ -92,5 +92,6 @@ uvb-22:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
index 60492b0eccb..3fcbaaffba5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
@@ -92,5 +92,6 @@ uvb-23:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
index 5d6994e9353..eb5bf2a3fa2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
@@ -92,5 +92,6 @@ uvb-24:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
index 7e06f8f18d6..9b233f29604 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -92,5 +92,6 @@ uvb-25:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
index 87f069cdb5d..93cd3283af8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -92,5 +92,6 @@ uvb-26:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
index edcba37672a..5eb52dd5c92 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -92,5 +92,6 @@ uvb-27:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
index 9b37ecae53d..dd8fc47b859 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -92,5 +92,6 @@ uvb-28:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
index 74938f2dcc0..15921ec55ef 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -92,5 +92,6 @@ uvb-29:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
index a32632e3d48..aef49cdc50d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
@@ -89,5 +89,6 @@ uvb-3:
       model: WDC WD2502ABYS-1
       rev: 2.03
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
index 6b9a3ee75ef..b26c0022f89 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
@@ -92,5 +92,6 @@ uvb-30:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
index a52159d29f5..22cd2a480e3 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -92,5 +92,6 @@ uvb-31:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
index 915b1ab39bb..53a9703a78e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
@@ -90,5 +90,6 @@ uvb-32:
       model: WDC WD2502ABYS-1
       rev: 02.03B05
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
index e791b0ac47e..3bf8da6d8f2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -92,5 +92,6 @@ uvb-33:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
index 7b17235a30d..858a9e7d87b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -92,5 +92,6 @@ uvb-34:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
index b1ab5e640db..8120ceae414 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -92,5 +92,6 @@ uvb-35:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
index 54b80a08b5d..70ecd90e25a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -92,5 +92,6 @@ uvb-36:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
index 807edf40ffd..1fc068ff802 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -92,5 +92,6 @@ uvb-37:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
index 5c40c550e99..5ed4da2382f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -92,5 +92,6 @@ uvb-38:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
index 920b26eb4be..0517d4adbd4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
@@ -92,5 +92,6 @@ uvb-39:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
index 66dec761924..acb2386174d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -92,5 +92,6 @@ uvb-4:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
index 71c2d57cf5d..72cb9a7ae32 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
@@ -92,5 +92,6 @@ uvb-40:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
index 787d6524dbe..c9d821b127c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -92,5 +92,6 @@ uvb-41:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
index bb9f1b8b417..3f3d6b4974f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -92,5 +92,6 @@ uvb-42:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
index 08af4d4f1f2..f9a717aaba1 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -92,5 +92,6 @@ uvb-43:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
index 371e5074f23..728fa829344 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -92,5 +92,6 @@ uvb-44:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
index 0f5808e74e3..e1189b2faf4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -92,5 +92,6 @@ uvb-5:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
index 06f5a5df7ee..ffa2b37283c 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -92,5 +92,6 @@ uvb-6:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
index aee9a80a903..7c0b1e9cbb4 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -92,5 +92,6 @@ uvb-7:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
index 65d1f178556..1de09a60859 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -92,5 +92,6 @@ uvb-8:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
index 65a504d03cb..aedc6f68a3a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -92,5 +92,6 @@ uvb-9:
       firmware_version: 02.03B05
       model: WDC WD2502ABYS-1
       size: 250000000000
+      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
index a9bdf09db80..4d8c1495e11 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
@@ -46,4 +46,3 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
-        storage: HDD
diff --git a/scripts/edit-input-storage.rb b/scripts/edit-input-storage.rb
new file mode 100755
index 00000000000..5b9ec03c1b2
--- /dev/null
+++ b/scripts/edit-input-storage.rb
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+#
+
+require 'yaml'
+require 'json'
+
+Dir.glob('input/grid5000/sites/*').each do |s|
+  site = s.split('/').last
+  Dir.glob("#{s}/clusters/*").each do |c|
+    cluster = c.split('/').last
+    #cluster_input = YAML.load(File.open("input/grid5000/sites/#{site}/clusters/#{cluster}/#{cluster}.yaml"))
+    #cluster_input_file = File.new("input/grid5000/sites/#{site}/clusters/#{cluster}/#{cluster}.yaml", "w")
+    #cluster_input['nodes'].each do |_, ng|
+    #  ng['storage_devices']&.each do |sd|
+    #    sd.delete('storage')
+    #  end
+    #end
+    #cluster_input_file.write(cluster_input.to_yaml)
+
+    Dir.glob("#{s}/clusters/#{cluster}/nodes/*").each do |n|
+      node = n.split('/').last.split('.').first
+      unless File.exist?("data/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.json")
+        next
+      end
+
+      data = JSON.load(File.open("data/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.json"))
+      input = YAML.load(File.open("input/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.yaml"))
+
+      data['storage_devices'].each do |sd|
+        input[node]['storage_devices'][sd['device']]['storage'] = sd['storage']
+        sd.delete('storage')
+      end
+
+      input_file = File.new("input/grid5000/sites/#{site}/clusters/#{cluster}/nodes/#{node}.yaml", "w")
+      input_file.write("# Generated by g5k-checks (g5k-checks -m api)\n")
+      input_file.write(input.to_yaml)
+    end
+  end
+end
-- 
GitLab