From 6b9dc33b4fed2e9399abaa66cd7e90e092b40b2b Mon Sep 17 00:00:00 2001
From: Samir Noir <samir.noir@inria.fr>
Date: Thu, 18 Feb 2021 11:36:39 +0100
Subject: [PATCH] Revert "Merge branch 'features/#9500' into 'master'"

This reverts merge request !182
---
 .../clusters/graffiti/nodes/graffiti-1.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-10.json  |  2 +-
 .../clusters/graffiti/nodes/graffiti-11.json  |  2 +-
 .../clusters/graffiti/nodes/graffiti-12.json  |  2 +-
 .../clusters/graffiti/nodes/graffiti-13.json  |  2 +-
 .../clusters/graffiti/nodes/graffiti-2.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-3.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-4.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-5.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-6.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-7.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-8.json   |  2 +-
 .../clusters/graffiti/nodes/graffiti-9.json   |  2 +-
 .../nancy/clusters/grue/nodes/grue-1.json     |  2 +-
 .../nancy/clusters/grue/nodes/grue-2.json     |  2 +-
 .../nancy/clusters/grue/nodes/grue-3.json     |  2 +-
 .../nancy/clusters/grue/nodes/grue-4.json     |  2 +-
 .../nancy/clusters/grue/nodes/grue-5.json     |  2 +-
 .../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 -------------------
 864 files changed, 105 insertions(+), 1586 deletions(-)
 delete mode 100755 scripts/edit-input-storage.rb

diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index dc3fac94145..7abc465dd03 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index ff39189b0e8..32ee36f974a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index 2fe1214e4ad..96113d49a5a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 7937aa784f6..eb05ea7784f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index 1f80db4133e..3f0c65338ae 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index bc14802011b..8b1d8835b52 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index ec6dd9ce4ce..43516692094 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index 05fa56cd793..0e31b672e96 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index aa9adfefad2..1c113a552af 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index ffa84f224e7..a2cab24b7da 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index aa7093c8c84..28f8aa241c9 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index a1c6a6b7434..f2a2fb2a28d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index 9dc113d2132..3b9aaea57f7 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -250,7 +250,7 @@
       "interface": "SATA",
       "model": "PERC H330 Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index 9af9a23fcee..6ad4dc831fa 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index 29ece3d2cd4..0c03cb46130 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 96b78b7f724..8c3a95717b5 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index 1523269e046..045e00a14d4 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index bcb28be5f0b..4aea8d40af9 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -232,7 +232,7 @@
       "interface": "SAS",
       "model": "PERC H730P Adp",
       "size": 479559942144,
-      "storage": "HDD",
+      "storage": "SSD",
       "vendor": "Dell"
     }
   ],
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
index 541dcdd833f..a1cd1ef1b0e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
@@ -42,7 +42,10 @@ 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 eeb4aecd81d..bd76ca5182f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -81,20 +81,17 @@ 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 f7ab9946fd6..a75c52730e7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -81,20 +81,17 @@ 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 952fb59af41..a5e9d0d6654 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -81,20 +81,17 @@ 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 60784bd38e9..c9288158772 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -81,20 +81,17 @@ 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 7f9297a180c..3e0173667f3 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -81,20 +81,17 @@ 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 125d9803b84..4421302c0f5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -81,20 +81,17 @@ 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 989ca5941dd..324d1c200f7 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -81,20 +81,17 @@ 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 431c5cef87c..ee6df49b773 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -81,20 +81,17 @@ 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 f1cab212675..1ea841317a2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -81,20 +81,17 @@ 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 8c9fea86703..f633b1f2123 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -81,20 +81,17 @@ 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 a63c668f06a..c2da2e1f0e9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -81,20 +81,17 @@ 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 64b24186df5..1c7efda4e73 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -81,20 +81,17 @@ 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 ae71cfceadb..1920d49693b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -81,20 +81,17 @@ 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 c8b4bfbf212..0a92eca2264 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -81,20 +81,17 @@ 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 4e04fb78676..9c71db6c667 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -81,20 +81,17 @@ 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 323d97db808..af2ef40a00a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -81,20 +81,17 @@ 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 25dc1b8c8ec..dade4e0498f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -81,20 +81,17 @@ 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 e16227a7cb0..66fa2e12f0e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -81,20 +81,17 @@ 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 7ae58dabb09..48ee4e13204 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -81,20 +81,17 @@ 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 33d4d70b000..5c25dbdb04f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -81,20 +81,17 @@ 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 61812afae22..a09311cb840 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -81,20 +81,17 @@ 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 606b07dcb94..e799ade3760 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -81,20 +81,17 @@ 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 19315101628..9ad63b2dfac 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -81,20 +81,17 @@ 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 fa6846f3057..c1807a361ec 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -81,20 +81,17 @@ 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 60ce99cd6e3..127a3f48f36 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -81,20 +81,17 @@ 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 10fad1b9691..39aaa4ad329 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -81,20 +81,17 @@ 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 eaa435cfcd5..5cf1ec03d5d 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -81,20 +81,17 @@ 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 a84a7ffe55b..39291a58a23 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -81,20 +81,17 @@ 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 b3307c9a7c4..feb2c15d9f2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -81,20 +81,17 @@ 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 576b5c66e0e..7f94f5de486 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -81,20 +81,17 @@ 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 e6f9f383d8b..564b7be880a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -81,20 +81,17 @@ 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 af76cbe39d9..e6c7bb0fc25 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -81,20 +81,17 @@ 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 e70af291560..ec8d28b18b5 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -60,5 +60,7 @@ 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 56c30758507..dd6dbdec861 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -161,11 +161,9 @@ 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 87c8e1122b8..20013d4ff26 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -161,11 +161,9 @@ 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 aa94021cb3b..a53b18faeef 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -161,11 +161,9 @@ 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 eb3cf012826..4b87817c3aa 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -161,11 +161,9 @@ 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 5175c5cb1c7..80212ad6442 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -161,11 +161,9 @@ 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 45b58fac184..176a6d92e15 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -161,11 +161,9 @@ 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 7cb9614c4e9..f1bc5051643 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -161,11 +161,9 @@ 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 ed6e03a0af1..81b93b40886 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -161,11 +161,9 @@ 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 15c876bc15a..83e39dcddd5 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -161,11 +161,9 @@ 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 700c899d194..b4520427455 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -161,11 +161,9 @@ 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 8bc281b1292..ddb87e3aade 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -161,11 +161,9 @@ 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 efd90a935c4..988f6c41662 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -161,11 +161,9 @@ 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 6be4eac705b..6ab8a9c3495 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -81,13 +81,11 @@ 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 3637743ebce..55cd5eac375 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -81,13 +81,11 @@ 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 23322047383..d407bcf037c 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -81,13 +81,11 @@ 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 5fe93b91f31..b853894b6dc 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -81,13 +81,11 @@ 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 da21b602f81..57032f42621 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
@@ -40,8 +40,10 @@ 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 4c3e032a825..711b8541b4a 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -98,34 +98,29 @@ 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 7eb2720ee7e..b993e93fb41 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -98,34 +98,29 @@ 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 e567999d2f2..d648845f370 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -98,34 +98,29 @@ 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 96bdc13ff88..19707dee2e6 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -98,34 +98,29 @@ 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 d1cdc27a58b..7c0c444ad11 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
@@ -48,16 +48,21 @@ 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 9c4fde9c1c1..a573aafa7d6 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
@@ -47,5 +47,7 @@ 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 96023687658..848910c2c2e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -88,13 +88,11 @@ 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 2936d826f28..9cf8b520c5a 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -88,13 +88,11 @@ 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 6280325c10e..0c7c411d249 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -88,13 +88,11 @@ 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 4e55d5f8d92..8bc809e7ff3 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -88,13 +88,11 @@ 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 21a39de591d..e4213498111 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -88,13 +88,11 @@ 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 8d201849212..0dec96bcc01 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -88,13 +88,11 @@ 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 3798e76d6bb..54bbee91b8d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -88,13 +88,11 @@ 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 98736c05252..3e3c11f439e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -88,13 +88,11 @@ 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 4f0eb3c2472..d8911f201fa 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -88,13 +88,11 @@ 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 93660a94683..0d2bb00496c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -88,13 +88,11 @@ 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 5f90382016b..30f5f9df9ea 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -88,13 +88,11 @@ 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 01be9f7bffe..758c20e1d12 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -88,13 +88,11 @@ 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 104b6e74bb7..915d1fbd461 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -88,13 +88,11 @@ 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 82cbf921b37..d0d778e5cf8 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -88,13 +88,11 @@ 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 2d59677e433..29dcb5af45e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -88,13 +88,11 @@ 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 32f27bbb2af..cb0ae87031e 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
@@ -55,9 +55,12 @@ 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 65085e22fb9..51b9a8e0ded 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -106,20 +106,17 @@ 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 89c58d1533b..133c1495131 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -106,20 +106,17 @@ 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 39335aa2971..150656e2606 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -106,20 +106,17 @@ 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 3fe306ea93b..ad337ef923a 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -106,20 +106,17 @@ 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 969777ba347..ff3552c09dc 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -106,20 +106,17 @@ 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 4019f34388e..dcadab31b4c 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -106,20 +106,17 @@ 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 189b114e8a9..3ee0f8d65a5 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -106,20 +106,17 @@ 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 e773cec2d79..9c64bed57bd 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -106,20 +106,17 @@ 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 3afd2c42864..e1bcb11ee5d 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
@@ -47,12 +47,16 @@ 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 10a6fabc420..8f0c690382b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -105,27 +105,23 @@ 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 4dd48cb213f..312572a1608 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -105,27 +105,23 @@ 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 80dec0e34af..cc10b6141ca 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -105,27 +105,23 @@ 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 b701e047db2..cfbed1842e9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -105,27 +105,23 @@ 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 7c1f251ba21..28095f81b47 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -105,27 +105,23 @@ 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 0e2c7721f4a..c8098c59fd9 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -105,27 +105,23 @@ 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 dade29c1c29..4f935ba7be5 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -105,27 +105,23 @@ 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 8f90c7b7135..931fcc2bfc3 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -105,27 +105,23 @@ 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 d0da4260491..e64003ac134 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
@@ -55,18 +55,24 @@ 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 a2bf6590e92..cae8c5cf306 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -123,41 +123,35 @@ 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 097808878b8..2ef9757f859 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -123,41 +123,35 @@ 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 e662ee37164..8550cc1b17b 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -123,41 +123,35 @@ 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 ecd631a90c4..c3620f44da3 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -123,41 +123,35 @@ 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 39109a0d7dc..db54662e3f9 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -123,41 +123,35 @@ 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 7372e705169..760c70048d4 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -123,41 +123,35 @@ 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 1717d7e9b84..acdfaf994f5 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -123,41 +123,35 @@ 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 7997bf6af58..4d7c6ede90d 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -123,41 +123,35 @@ 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 503de440002..ec15bcf48b1 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -70,6 +70,5 @@ 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 d36e8bf2266..fc47792561e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -70,6 +70,5 @@ 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 ce962061793..b306db6d34a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -70,6 +70,5 @@ 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 98988753c9e..d56ba57201d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -70,6 +70,5 @@ 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 65878904217..6209c9ab812 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -70,6 +70,5 @@ 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 3f597b0be42..4c40499e706 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -70,6 +70,5 @@ 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 e018291db0c..7e1084cd71f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -70,6 +70,5 @@ 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 7737e486b8e..7a2066d80ec 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -70,6 +70,5 @@ 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 7b2c1561318..3078e87d842 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -70,6 +70,5 @@ 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 1198639efd7..392873b3cfa 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -70,6 +70,5 @@ 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 555986e33f7..78495bb96ff 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -70,6 +70,5 @@ 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 bfbd9e46322..aa56927d284 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -70,6 +70,5 @@ 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 a84e6d4d395..1847a4835ec 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -70,6 +70,5 @@ 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 d171af3dede..6db6872a252 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -70,6 +70,5 @@ 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 858b2646878..10f8275bf44 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -70,6 +70,5 @@ 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 bbae14e860e..8eba4668ba2 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -20,6 +20,7 @@ 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 227c694e219..97ed1f00550 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
@@ -16,17 +16,22 @@ 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 bd34d561490..8b2e0a5e63c 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -179,34 +179,29 @@ 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 68fa50e6a62..444f1f94136 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -179,34 +179,29 @@ 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 3052c6b2785..5f1cbd132a6 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -21,10 +21,13 @@ 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 9a8aa9eb0ae..b87d6d2f1d7 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -87,20 +87,17 @@ 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 5da8c07c477..72b41c23335 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -87,20 +87,17 @@ 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 e662e2d7754..0bf9c2b739b 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -87,20 +87,17 @@ 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 5c36be73393..915d4561a41 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -87,20 +87,17 @@ 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 253e97821ff..3c0fe5a1f1d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -105,6 +105,5 @@ 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 c550f890b86..42a7dba486a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -105,6 +105,5 @@ 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 b5f52bcc31f..f5e9e01b8f6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -105,6 +105,5 @@ 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 ca10084a943..3e7fe90e184 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -105,6 +105,5 @@ 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 b460db28188..46f8dea1d0d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -105,6 +105,5 @@ 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 78f403c51f0..033b378fa9e 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -105,6 +105,5 @@ 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 70b1b2cabc2..af36b6b091d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -105,6 +105,5 @@ 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 d145f72533b..4c3a5dbacd0 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -105,6 +105,5 @@ 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 c078660d1ce..4de54c73443 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -105,6 +105,5 @@ 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 8e27a6992ec..928ea927607 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -105,6 +105,5 @@ 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 7a64670e9f8..a677d132018 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -105,6 +105,5 @@ 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 55545861da3..3fc25fe68dc 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -105,6 +105,5 @@ 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 aa0a883e811..fc06069862f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -105,6 +105,5 @@ 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 7d5df00d756..a4a7b2656a6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -105,6 +105,5 @@ 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 a17e6840a8b..f987dad3cd6 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -105,6 +105,5 @@ 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 ff7f497c512..b83aa9e533a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -105,6 +105,5 @@ 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 4c3544a0556..46ff37551fe 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -105,6 +105,5 @@ 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 78cd2608894..7f06435612d 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -105,6 +105,5 @@ 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 4b6789dc122..96d9118755f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -105,6 +105,5 @@ 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 09cc8952957..8dae4a6ba83 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -105,6 +105,5 @@ 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 5a0b1a3ec9a..4d03b295704 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -105,6 +105,5 @@ 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 7cb4700bb46..80e5892d22c 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -105,6 +105,5 @@ 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 2c409c86991..71f70488ba8 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -105,6 +105,5 @@ 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 6ad68e9dd79..2c6785924d3 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml
@@ -21,6 +21,7 @@ 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 b55adee8709..74bd1b7bf39 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -105,6 +105,5 @@ 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 506f3a14e1f..749eede86ff 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -105,6 +105,5 @@ 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 ea58aa187b1..f58d679ef0d 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -105,6 +105,5 @@ 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 348f50a20d6..2e2bde5f50d 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -105,6 +105,5 @@ 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 b63ec046785..ba36afe41df 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -21,6 +21,7 @@ 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 28c5ca78823..5b2505d7e44 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -81,13 +81,11 @@ 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 bfab8f79cbc..ee7d52eccf9 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -81,13 +81,11 @@ 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 f629d895506..52e3ce8becd 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -81,13 +81,11 @@ 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 8a4daad04ef..8ff63b63893 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -81,13 +81,11 @@ 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 fcf87814ef3..b684e5fdba3 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
@@ -34,8 +34,10 @@ 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 a034c1401b9..be637d06cc9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -68,6 +68,5 @@ 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 53e06ab4baa..5fe0001e5e2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -68,6 +68,5 @@ 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 62d044390fd..3c357243a7a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -68,6 +68,5 @@ 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 bc55f9f24da..28cac22ebcc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -68,6 +68,5 @@ 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 c3062e16b8c..bc56f72aeda 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -68,6 +68,5 @@ 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 6d5cc7d10ac..470e5e0af3b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -68,6 +68,5 @@ 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 84651978881..59ae482e6c1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -68,6 +68,5 @@ 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 3dd80248d82..4ef763f5f18 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -68,6 +68,5 @@ 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 40c30105716..417818b7c5a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -68,6 +68,5 @@ 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 adf0db89452..9107ec5d3b1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -68,6 +68,5 @@ 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 abc567abc7c..c04891653da 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -68,6 +68,5 @@ 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 4efc4c8c892..36ba0247cec 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -68,6 +68,5 @@ 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 12fae3eb909..3fb97ddc9a8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -68,6 +68,5 @@ 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 0a919580618..4f3b93b1da9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -68,6 +68,5 @@ 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 f618ec6ac34..2890679838c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -68,6 +68,5 @@ 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 829b9c22f12..c9b475fd48c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -68,6 +68,5 @@ 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 0a1aaef6caa..1cc37b40ecf 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -68,6 +68,5 @@ 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 ed45194b792..784a1bfaa29 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -68,6 +68,5 @@ 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 34f7306186a..c94e457a134 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -68,6 +68,5 @@ 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 497c958b0cb..fe4bacb06c5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -68,6 +68,5 @@ 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 535181e516f..d4c0316f39d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -34,6 +34,7 @@ nodes:
     storage_devices:
       sda:
         interface: SCSI
+        storage: HDD
     network_adapters:
       eth0:
         enabled: false
@@ -69,6 +70,7 @@ 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 75688d4adc6..88920fc3cdd 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -105,6 +105,5 @@ 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 83d296b3ba4..c004189bcb0 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -105,6 +105,5 @@ 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 c54b6c18b06..75cc5a6ac6b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -105,6 +105,5 @@ 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 1d71a9c7fc8..4a793ffb126 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -105,6 +105,5 @@ 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 14ba9cff6ce..cd19c9c38c0 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -105,6 +105,5 @@ 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 c73a56bbe48..071704d5005 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -105,6 +105,5 @@ 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 a625d6c7ffc..caee83046d8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -105,6 +105,5 @@ 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 2d3c69592df..a221afe37fb 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -105,6 +105,5 @@ 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 b9ab5d18020..bc133aadc4e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -105,6 +105,5 @@ 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 c3af4647367..a29761f1c2f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -105,6 +105,5 @@ 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 8eeb8c49a2f..8b620918fd8 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -105,6 +105,5 @@ 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 6f8c1a9bef8..ce953994321 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -105,6 +105,5 @@ 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 006e0ca47ba..82c0360bf67 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -105,6 +105,5 @@ 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 e6de5b1355a..43b54b7152c 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -105,6 +105,5 @@ 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 8efb70acedd..cd8a04e2302 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -26,6 +26,7 @@ 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 523e2d45a6f..e4c7d9f2a26 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
@@ -44,6 +44,7 @@ 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 bf47fbdf230..0817a1ba426 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -120,6 +120,5 @@ graffiti-1:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 5305c6fcea6..1e00a3b1337 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -120,6 +120,5 @@ graffiti-10:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 cd4a6fd842e..5606d614670 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -120,6 +120,5 @@ graffiti-11:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 cee21ca8295..90fdd01010d 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -120,6 +120,5 @@ graffiti-12:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 62e1cc4e942..5dbb8eff85d 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -120,6 +120,5 @@ graffiti-13:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 36aca3a9a6c..e61ec469ead 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -120,6 +120,5 @@ graffiti-2:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 3a808ee4e6f..a6b006808d3 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -120,6 +120,5 @@ graffiti-3:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 a61be5f6953..61e13b8cf7f 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -120,6 +120,5 @@ graffiti-4:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 0a95e5534ea..01189fcbfbe 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -120,6 +120,5 @@ graffiti-5:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 cb47c1502d5..678bca2840a 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -120,6 +120,5 @@ graffiti-6:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 5c929faca7e..a5e6854e0e2 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -120,6 +120,5 @@ graffiti-7:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 f1f571e0c84..2a452e2a8a2 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -120,6 +120,5 @@ graffiti-8:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 832c40de6da..a5dd1b05b82 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -120,6 +120,5 @@ graffiti-9:
       firmware_version: 4.3
       model: PERC H330 Adp
       size: 479559942144
-      storage: HDD
   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 4949c45bfc2..2df3252d116 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -21,8 +21,10 @@ 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 031efb5ef1c..36cf4848c1d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -117,13 +117,11 @@ 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 eac65d7b170..50acc407115 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -117,13 +117,11 @@ 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 5a3dd1fd029..09fe4a333c1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -117,13 +117,11 @@ 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 ad7e037ab2e..705f31d4eea 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -117,13 +117,11 @@ 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 8a5048821a0..bbabfed2d8a 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -117,13 +117,11 @@ 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 5be431e525c..817c3fd9705 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -117,13 +117,11 @@ 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 3ebb8bf908b..852e205636a 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -117,13 +117,11 @@ 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 fb60809c883..e681df3bf3a 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -117,13 +117,11 @@ 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 d81f87832e0..1225456eb99 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -117,13 +117,11 @@ 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 012f017b923..08793dbbb0c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -117,13 +117,11 @@ 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 60c49a3900d..c89bd84619f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -117,13 +117,11 @@ 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 5b5ab79bd79..080997e2db1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -117,13 +117,11 @@ 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 f0f79ebf87a..c734c187ae0 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -117,13 +117,11 @@ 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 3820434f348..848b083dbb6 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -117,13 +117,11 @@ 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 3264dc8fe83..d1eaf3bad10 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -117,13 +117,11 @@ 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 ba08109816c..ef7011b2d6f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -117,13 +117,11 @@ 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 1339ca9c610..7267a5a3957 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -21,6 +21,7 @@ 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 b71f176ae9d..ba093b12aa3 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -116,6 +116,5 @@ 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 7b26a93c132..ece58c9b472 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -116,6 +116,5 @@ 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 b2965736d02..f2766035ab9 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -116,6 +116,5 @@ 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 6c408056e73..946c9756f0e 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -116,6 +116,5 @@ 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 7fd6a7affa6..aeb5db5e4b0 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -116,6 +116,5 @@ 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 ce75723e261..07afad6af88 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -116,6 +116,5 @@ 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 6efeb125ca8..951130ff60c 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -22,8 +22,10 @@ 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 fb733a9cac7..0602772c5ef 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -99,13 +99,11 @@ 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 20d62f999ff..909f25b4199 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -99,13 +99,11 @@ 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 0e5ca275197..a35fb28c4ad 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -99,13 +99,11 @@ 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 854b64bc2c4..31e0f7796f5 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -99,13 +99,11 @@ 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 1614bd49ef6..f0930c81535 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml
@@ -49,9 +49,11 @@ 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 4ac21386d6c..fde1e4485dc 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -105,13 +105,11 @@ 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 e3f024fbd8d..64ad3ed0b35 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -105,13 +105,11 @@ 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 5733c72efb5..0abefc597d0 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -105,13 +105,11 @@ 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 af913ba8251..d60db2395a1 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -105,13 +105,11 @@ 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 dff8b756a80..726cf48700c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -105,13 +105,11 @@ 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 b09cb24fdf5..d40d5fda90a 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -105,13 +105,11 @@ 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 cf6e428c0be..5971265f448 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -105,13 +105,11 @@ 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 e6d5c00fb7c..ee2695986fa 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -105,13 +105,11 @@ 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 a7a0e197d21..2ccba03984e 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -105,13 +105,11 @@ 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 7d09562618f..c739f514247 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -105,13 +105,11 @@ 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 22c80107546..6320b9b5f6b 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -105,13 +105,11 @@ 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 485a16604df..729f425abef 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -105,13 +105,11 @@ 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 bfa2bc76249..42e9fab098f 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -105,13 +105,11 @@ 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 b6c72c9a5ab..c5ba14d47ca 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -105,13 +105,11 @@ 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 ace55088162..5a11c1acaa6 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -105,13 +105,11 @@ 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 cde146fdbcc..c8bd6dd4e11 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -105,13 +105,11 @@ 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 6a2e1a3191a..3065d44fcd2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml
@@ -39,6 +39,7 @@ 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 f1baf5b9f8b..d9fc976b381 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -81,6 +81,5 @@ 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 a6d3f3bd454..bd5795b9b91 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -81,6 +81,5 @@ 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 e12dd33f4e3..33371b147b3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -81,6 +81,5 @@ 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 8412361bc40..56b45026fe8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -81,6 +81,5 @@ 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 f66f32e0611..fc978ff05dd 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -81,6 +81,5 @@ 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 da6b35304d8..95c7b97a258 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -81,6 +81,5 @@ 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 d8804ca9e6b..caf37c471f0 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -81,6 +81,5 @@ 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 1baf89aec2c..b2ca78436d4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -81,6 +81,5 @@ 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 194d9464001..bd2ff9e6d2b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -81,6 +81,5 @@ 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 5c45ff66e59..7eb39378638 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -81,6 +81,5 @@ 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 ed254ef1a29..8c5475c3173 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -81,6 +81,5 @@ 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 cf98f090574..26d0cd7ff7b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -81,6 +81,5 @@ 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 041c3daafa1..bffc81a2302 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -81,6 +81,5 @@ 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 a6e88c398a2..d6509be8f38 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -81,6 +81,5 @@ 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 1504bac4bb6..8e778164fbc 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -81,6 +81,5 @@ 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 9ef0528c28b..cebeca59f96 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -81,6 +81,5 @@ 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 fb1b15573fe..a1850812c64 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -81,6 +81,5 @@ 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 295d96c6145..cf23109ad44 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -81,6 +81,5 @@ 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 6c74e316f4b..12e9cd2c337 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -81,6 +81,5 @@ 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 95e201e3f69..b7c9f5139c5 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -81,6 +81,5 @@ 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 398e870f026..b54dcfee48c 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -81,6 +81,5 @@ 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 0bf1b53ab6d..7637d6aee82 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -81,6 +81,5 @@ 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 3ee2aa415b2..1c777870c08 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -81,6 +81,5 @@ 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 ce848a9a638..ee1ada80680 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -81,6 +81,5 @@ 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 b3c6c0f4fc7..c1879c0d1f9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -81,6 +81,5 @@ 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 bfd8c65b459..70fe659c945 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -81,6 +81,5 @@ 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 4d2bd1ad9e2..eb88788f742 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -81,6 +81,5 @@ 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 68644a989db..092f35ef5e7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -81,6 +81,5 @@ 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 f94b8e4c77f..286e29e55c1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -81,6 +81,5 @@ 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 28a872ae18f..a8d6b0ed330 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -81,6 +81,5 @@ 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 2dce411626d..44a1a7e1afa 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -81,6 +81,5 @@ 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 e54f92385e0..25a910d0d0d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -81,6 +81,5 @@ 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 5b22938642d..91c79e850f3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -81,6 +81,5 @@ 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 55a446c9ef4..dc7e3e9d56a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -81,6 +81,5 @@ 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 62ed14719ca..4b57b0fce45 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -81,6 +81,5 @@ 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 57508b33deb..214d99a69f9 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -81,6 +81,5 @@ 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 beb04cef55e..bb03f32c46b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -81,6 +81,5 @@ 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 335281a772e..e84fb28767d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -81,6 +81,5 @@ 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 d4da80c75ca..143a6cf317f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -81,6 +81,5 @@ 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 6421c4a1b1f..1cf62d5297f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -81,6 +81,5 @@ 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 c70484f7e46..5bb3c1513fe 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -81,6 +81,5 @@ 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 c1a1534220c..e4d4616afb1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -81,6 +81,5 @@ 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 ba654a82e44..4d5d01cd586 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -81,6 +81,5 @@ 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 5282d76c80c..8abfb79392f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -81,6 +81,5 @@ 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 4c98a8542a5..21b87db8c92 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -81,6 +81,5 @@ 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 7bd4bb151fb..3cbff528e18 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -81,6 +81,5 @@ 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 12a546afaa8..cc932049b12 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -81,6 +81,5 @@ 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 0e4b95970ed..b6dc6a0d246 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
@@ -51,8 +51,10 @@ 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 c777a491ffa..a696171eb4b 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -116,13 +116,11 @@ 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 f629b367a92..1547db01aa9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -116,13 +116,11 @@ 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 f96a5dd4016..17c2277e6cc 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -116,13 +116,11 @@ 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 738ef0b4699..02133e8dc8e 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -116,13 +116,11 @@ 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 ee40ee42bb3..e4ac3ada558 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -116,13 +116,11 @@ 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 4617a57c68c..68b5b85c979 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -116,13 +116,11 @@ 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 3cbf5b882d6..afbc9b173d9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -116,13 +116,11 @@ 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 5f6e9583aaf..7a69a855b39 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -116,13 +116,11 @@ 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 f0e57afbc75..85002539927 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -116,13 +116,11 @@ 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 70ef45fa149..737be1e52cd 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -116,13 +116,11 @@ 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 8f8dd11fcb8..d25475ee2e0 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -116,13 +116,11 @@ 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 2d790fa9a01..61accc721b8 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -116,13 +116,11 @@ 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 e2d530b34cd..d63330bed27 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -116,13 +116,11 @@ 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 d917d88fd77..2be95775012 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -116,13 +116,11 @@ 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 1b33ecc3c24..045b630bcd0 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
@@ -24,6 +24,7 @@ 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 95bc6386737..8dacc2c20e1 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -116,6 +116,5 @@ 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 26be3e8fc63..6d43b60f0e0 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -116,6 +116,5 @@ 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 457b1e3a7e1..27f789c7eea 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -116,6 +116,5 @@ 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 313d4641799..85eb449d93b 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -116,6 +116,5 @@ 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 beeccaf0452..b7368c4b8eb 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -116,6 +116,5 @@ 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 9655972e3de..ebfae8d33ef 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -116,6 +116,5 @@ 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 df5d632da24..49b99cab93c 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
@@ -22,20 +22,26 @@ 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 6e7cb983bf4..400c939dbbc 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -120,41 +120,35 @@ 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 c5ef7f0c635..87372a54f99 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -120,41 +120,35 @@ 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 af10bc53983..85bee46e07f 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -120,41 +120,35 @@ 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 1af2427225f..1ef496ff087 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -120,41 +120,35 @@ 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 f9d2adbf8ae..e8d7e9765ff 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -120,41 +120,35 @@ 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 5b0915e59be..68747106334 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -120,41 +120,35 @@ 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 467382e1db6..eabc134b7d8 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -120,41 +120,35 @@ 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 449f124a2a2..09c8f433a1d 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -120,41 +120,35 @@ 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 cbb0ccd8f6b..7b8d40f6fe3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -23,8 +23,10 @@ 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 ea486b54e2f..a921bd4a1db 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -109,13 +109,11 @@ 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 a3a4ebb2ccf..bbe7646ed1f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -109,13 +109,11 @@ 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 796563852f7..07a9d8ce5c5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -109,13 +109,11 @@ 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 9685c4f24ec..3fe7d4e54ba 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -109,13 +109,11 @@ 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 e0fc8fe5041..210d4260074 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -109,13 +109,11 @@ 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 6565322832e..3d7e658aecd 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -109,13 +109,11 @@ 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 ac149513620..3b44b0d97a7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -109,13 +109,11 @@ 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 44f7d889787..39b479ba9a3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -109,13 +109,11 @@ 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 3c919062326..31a4e9bd92b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -109,13 +109,11 @@ 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 08adc03e34c..9f53a3c19aa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -109,13 +109,11 @@ 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 c993bc6bd89..7d394e8777e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -109,13 +109,11 @@ 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 acb72b3c057..0707e5b91ec 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -109,13 +109,11 @@ 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 81dab81ea55..460050b917c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -109,13 +109,11 @@ 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 bd127263367..313742402e1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -109,13 +109,11 @@ 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 32f85310020..4db15721a73 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -109,13 +109,11 @@ 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 db18bb10eba..f23b0b12325 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -109,13 +109,11 @@ 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 89db33be9b9..d24a5575c8e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -109,13 +109,11 @@ 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 0326e3df140..02d07999150 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -109,13 +109,11 @@ 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 1c5b7f3c116..a5ced463d5d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -109,13 +109,11 @@ 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 c265d7a48a9..e2576c72651 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -109,13 +109,11 @@ 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 6edc22f4f88..771e5f941ee 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -109,13 +109,11 @@ 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 9e9e7dbef7f..5cd9fddf601 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -109,13 +109,11 @@ 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 9245e58b719..bc846cbf5c7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -109,13 +109,11 @@ 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 e819f4d3ddc..71abdede504 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -109,13 +109,11 @@ 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 fb2d8f6b4ae..7679529af1c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -109,13 +109,11 @@ 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 6cd402165bd..454de620260 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -109,13 +109,11 @@ 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 87f1c8e0e71..e96028cb9af 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -109,13 +109,11 @@ 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 25e32292415..2ece13a8d52 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -109,13 +109,11 @@ 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 1c2b5be7c5d..aa412bc759c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -109,13 +109,11 @@ 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 52cabe4466f..e558bb25845 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -109,13 +109,11 @@ 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 a9a934a05aa..3f878c612a4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -109,13 +109,11 @@ 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 39d7ede0980..1459c54ef99 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -109,13 +109,11 @@ 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 b9d2e35b21b..7081c459ae8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -109,13 +109,11 @@ 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 a2c41dd2420..a20f6f3602a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -109,13 +109,11 @@ 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 e1dc2f94c6a..616ad1d4002 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -109,13 +109,11 @@ 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 69f6ddcce04..e5e48448955 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -109,13 +109,11 @@ 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 fedb11d4d54..6c06ad956c3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -109,13 +109,11 @@ 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 ef4978e87f4..95ba5d1b679 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -109,13 +109,11 @@ 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 26a1925bbbe..aa58a01837b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -109,13 +109,11 @@ 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 9ab0b7eea7a..52129a45df6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -109,13 +109,11 @@ 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 af95ceb003c..9158e9f13da 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -109,13 +109,11 @@ 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 e29d8b8b9ae..19a42194ad1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -109,13 +109,11 @@ 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 0d2d9b778a5..d412cb51b2d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -109,13 +109,11 @@ 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 3967f33ae05..07a37e8d0ac 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -108,13 +108,11 @@ 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 21b05cf2acd..b2dd9167fee 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -109,13 +109,11 @@ 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 b4a7f7d9901..40e0bd8e1f5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -120,13 +120,11 @@ 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 5744310f4dd..9a0355f28d8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -120,13 +120,11 @@ 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 b6bd394832e..a8b0952b38f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -109,13 +109,11 @@ 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 dc8967d09f8..ae66e196e37 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -109,13 +109,11 @@ 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 a2a9a55a997..9c835b095e1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -109,13 +109,11 @@ 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 02681aa1899..dc4c3012e38 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -109,13 +109,11 @@ 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 1e2827c5732..4a4190a2cff 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
@@ -35,8 +35,10 @@ 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 b7b434396d1..fce92016a97 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -70,13 +70,11 @@ 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 a4647bec51d..183a1900bff 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -70,13 +70,11 @@ 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 bfced7cc503..cdfee13c48e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -70,13 +70,11 @@ 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 1c646ec3c97..f49714e34be 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -70,13 +70,11 @@ 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 0c582a26095..42fb5bcd0d9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -70,13 +70,11 @@ 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 a98586ea1bf..1883f8ff90b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -70,13 +70,11 @@ 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 3425e8989ca..c5d12674dd8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -70,13 +70,11 @@ 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 bda43c37378..4986e4f04d8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -70,13 +70,11 @@ 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 e9eeee764cc..df6cd6bc115 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -70,13 +70,11 @@ 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 010b4a57e1c..c899df1627a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -70,13 +70,11 @@ 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 f117d02ac05..427f3fc4223 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -70,13 +70,11 @@ 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 b483cf50e43..a9a057ca02b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -70,13 +70,11 @@ 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 99421b15794..b1da2082a45 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -70,13 +70,11 @@ 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 20185849e0a..37399c49b44 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -70,13 +70,11 @@ 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 37535ba0222..d872912dc71 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -70,13 +70,11 @@ 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 4cb16981f2e..76e5d94825a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -70,13 +70,11 @@ 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 9544b83b4c3..6e8aa63d427 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -70,13 +70,11 @@ 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 cb76416e9af..14e16c15ae9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -70,13 +70,11 @@ 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 246a74a2774..3d35163c642 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -70,13 +70,11 @@ 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 de759e13d68..8986a3e00e1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -70,13 +70,11 @@ 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 248c2dcbcbf..79f255c4afd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -70,13 +70,11 @@ 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 12902253182..f1f3f29da0c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -70,13 +70,11 @@ 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 2f214339159..265768059e6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -70,13 +70,11 @@ 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 6978e367abe..8e91537b8e0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -70,13 +70,11 @@ 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 1f88670729b..3815716e537 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -70,13 +70,11 @@ 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 352b57e6427..6c636028b74 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -70,13 +70,11 @@ 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 6f49bf70b95..d02e497556a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -70,13 +70,11 @@ 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 ca15c311fa4..82d06712810 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -70,13 +70,11 @@ 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 3953f0414db..93b566f3588 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -70,13 +70,11 @@ 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 942a80038b1..e50394811d7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -70,13 +70,11 @@ 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 718d78b82e7..cbc4a7be721 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -70,13 +70,11 @@ 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 d2a2ea9d95b..82045d61f31 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -70,13 +70,11 @@ 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 6728ed941be..2e12289e845 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -70,13 +70,11 @@ 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 72ad63052ab..01be3c82237 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -70,13 +70,11 @@ 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 4701b563613..ed0ded3240e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -70,13 +70,11 @@ 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 c9ac48d1fb7..70b0f897589 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -70,13 +70,11 @@ 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 546128f44bc..fc2a1609725 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -70,13 +70,11 @@ 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 8d67fab24ed..d235ad79d02 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -70,13 +70,11 @@ 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 543ab282dcc..25eae7b667c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -70,13 +70,11 @@ 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 ec5cdec63e8..f9ea267de1b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -70,13 +70,11 @@ 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 e35d3ee8d83..e5664d62850 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -70,13 +70,11 @@ 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 6befe87347e..f9de0e0f72e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -70,13 +70,11 @@ 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 6f74d792c19..e7eb95a89d8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -70,13 +70,11 @@ 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 ed72412f896..1af8d170d92 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -70,13 +70,11 @@ 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 987e0e832a3..587f93d7948 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -70,13 +70,11 @@ 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 2ffea3d256d..cb3de388247 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -70,13 +70,11 @@ 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 4f9d9924b64..744676763f7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -70,13 +70,11 @@ 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 500634392fd..b61df994239 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -70,13 +70,11 @@ 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 61208a71849..e488815d683 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -70,13 +70,11 @@ 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 162b19d9b52..d9235064112 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -70,13 +70,11 @@ 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 08920fa383f..ec5ff794a27 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -70,13 +70,11 @@ 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 33941bce3ee..1c6d1cd661f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -70,13 +70,11 @@ 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 1093dd5ca18..5a2dcad1141 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -70,13 +70,11 @@ 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 3b66c378ca2..60e24e7ba5f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -70,13 +70,11 @@ 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 1b8232bc7f2..b69a39f85e3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -70,13 +70,11 @@ 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 e4aaee4e79b..4df8c59b679 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -70,13 +70,11 @@ 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 6491c7e9974..16415ea2519 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -70,13 +70,11 @@ 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 f836916571b..fa7f20c80c5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -70,13 +70,11 @@ 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 3ad1cd22035..711ed3ac7ab 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -70,13 +70,11 @@ 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 a810922e168..64cff36d279 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -70,13 +70,11 @@ 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 d231d67a0fc..642588c2568 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -70,13 +70,11 @@ 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 20b10c7fd9d..b545be095e3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -70,13 +70,11 @@ 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 545363d4359..8a81800dad7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -70,13 +70,11 @@ 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 a94b1f65462..77b7fdc407b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -70,13 +70,11 @@ 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 576072c6b1b..24ef713a10e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -70,13 +70,11 @@ 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 6513148c43c..b7cc6cd2f6e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -70,13 +70,11 @@ 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 59d9a04d81b..64f00442dd9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -70,13 +70,11 @@ 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 c52f6b45469..4b3e6a5fab6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -70,13 +70,11 @@ 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 eb3d4e974d6..23f64ed920d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -70,13 +70,11 @@ 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 c9148ec0063..ae4a400e53c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -70,13 +70,11 @@ 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 b9a615d025b..bd07b18d7fa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -70,13 +70,11 @@ 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 9afafb4df7c..c81ff7be4d6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -70,13 +70,11 @@ 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 7d69e3eb5b6..8f22be26215 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -70,13 +70,11 @@ 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 12b29a270bc..626e112ce1d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -70,13 +70,11 @@ 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 c8133e9dbd4..2390af2d96f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -70,13 +70,11 @@ 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 3c7ed0cd94b..f0ae620ae3d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -70,13 +70,11 @@ 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 be78814868f..0a2f77c9855 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -70,13 +70,11 @@ 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 6baf2edf3f2..26617af126d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -70,13 +70,11 @@ 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 6508480d18b..dbcdcf916a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -70,13 +70,11 @@ 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 89cf519455f..7b5be94c24c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -70,13 +70,11 @@ 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 74937d769bc..de37bef3c04 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -70,13 +70,11 @@ 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 c2f2d1b7c95..c3263845473 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -70,13 +70,11 @@ 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 fe9bcfe19ff..82fb2c82828 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -70,13 +70,11 @@ 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 b3e7bf884f7..e01bc835576 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -70,13 +70,11 @@ 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 7e4a889ebf4..097ff9bf7ed 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -70,13 +70,11 @@ 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 5a7b51fcbdf..88f383a395d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -70,13 +70,11 @@ 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 de3210fd9d4..50c973a7e0c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -70,13 +70,11 @@ 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 78948b8b695..f8ad7ca2c0d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -70,13 +70,11 @@ 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 6fbaa1c806d..f90379c46b0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -70,13 +70,11 @@ 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 1e1a06ef79d..2e132334cde 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -70,13 +70,11 @@ 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 e43010431eb..db6a72a1823 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -70,13 +70,11 @@ 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 a262f6a939a..84bfb5a3d80 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -70,13 +70,11 @@ 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 75d71e9801d..bcfdefcac64 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -70,13 +70,11 @@ 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 075fcf1a8df..fd661d4b8a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -70,13 +70,11 @@ 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 df4bcc8d504..3dc3ecd3b64 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -70,13 +70,11 @@ 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 305d9297611..4aae43e94c6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -70,13 +70,11 @@ 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 15fd0337880..69428c8a092 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -70,13 +70,11 @@ 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 19cbcfe78c1..b8bd6f57b05 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -70,13 +70,11 @@ 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 e1face7ec58..be7806f358f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -70,13 +70,11 @@ 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 e796e462a71..3168c634531 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -70,13 +70,11 @@ 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 3d2125334b0..cabbaf17289 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -70,13 +70,11 @@ 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 cfe0599d20f..a2030f4a419 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -70,13 +70,11 @@ 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 e3579663b6e..d4bdad0f272 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -70,13 +70,11 @@ 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 3ede289547e..85d6f1b7771 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -70,13 +70,11 @@ 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 657ad8ff064..8bc6919f927 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -70,13 +70,11 @@ 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 4238fdb226c..144c2f86cc4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -70,13 +70,11 @@ 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 fbdbd5c5fa0..60002fdc5cf 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -70,13 +70,11 @@ 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 12a1abd0097..d0d04bd335e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -70,13 +70,11 @@ 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 9b3db26244e..bbd7fc8c085 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -70,13 +70,11 @@ 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 3d579bb4310..37eedd3613b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -70,13 +70,11 @@ 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 37eed84ede0..b5b78f2133a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -70,13 +70,11 @@ 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 2cd9e6b5460..2d3103cff8e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -70,13 +70,11 @@ 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 e96b8264ad7..a0416136c16 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -70,13 +70,11 @@ 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 deb94acdc9f..be89b21f8df 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -70,13 +70,11 @@ 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 bb002f0ea25..cb7303f9446 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -70,13 +70,11 @@ 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 75c9fc9c8fd..bd767cb5e07 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -70,13 +70,11 @@ 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 a257b7f572d..7cd2bb0da29 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -70,13 +70,11 @@ 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 1062e37377c..4a467b9c09e 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -70,13 +70,11 @@ 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 c5f3e9e41da..9d5e9153a70 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -70,13 +70,11 @@ 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 c5b0411cc45..72324d76e66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -70,13 +70,11 @@ 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 86a2bcab02c..e9f53502e0a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -70,13 +70,11 @@ 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 a248f1c1f0f..f03608ac145 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -70,13 +70,11 @@ 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 adb20507b25..1794f6033ad 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -70,13 +70,11 @@ 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 fc62302fc1f..6315a595b3f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -70,13 +70,11 @@ 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 bc3333d0a0d..5be690ffea2 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
@@ -41,5 +41,7 @@ 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 1ce8b7e9024..27c3761e7a4 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -104,13 +104,11 @@ 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 8d5042421c4..21b0d693721 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -104,13 +104,11 @@ 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 3972aa6ced9..94f3c031b3f 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
@@ -40,6 +40,7 @@ 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 4efb609bac5..0f99419cf33 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -120,6 +120,5 @@ grue-1:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
-      storage: HDD
   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 305b1ea6092..1109c245a58 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -120,6 +120,5 @@ grue-2:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
-      storage: HDD
   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 40e17198b88..bb301bacec2 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -120,6 +120,5 @@ grue-3:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
-      storage: HDD
   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 0c48d28234b..7d2f9387517 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -120,6 +120,5 @@ grue-4:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
-      storage: HDD
   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 a6153f11a5b..c2d3f5f205c 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -120,6 +120,5 @@ grue-5:
       firmware_version: 4.3
       model: PERC H730P Adp
       size: 479559942144
-      storage: HDD
   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 e7dccbaf9af..3bbb56712e6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml
@@ -38,6 +38,7 @@ 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 7c2f7a25c30..f406a677ea1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -81,6 +81,5 @@ 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 b39c3c93b28..f5f89240f0b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -81,6 +81,5 @@ 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 9b8a35ce18f..03ab2deea92 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -81,6 +81,5 @@ 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 53cb0a157ce..3ddfdc5e99d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -81,6 +81,5 @@ 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 40df07bc106..ec9e7f48290 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -81,6 +81,5 @@ 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 cbe4bb1b1ce..dbcbf610db0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -81,6 +81,5 @@ 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 5095de33f08..d7506366b70 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -81,6 +81,5 @@ 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 88a2b92622c..d9d35e66050 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -81,6 +81,5 @@ 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 a55c343f9dd..73a1a5018c9 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -81,6 +81,5 @@ 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 45d4db9a6da..d10091b6aa3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -81,6 +81,5 @@ 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 801c07b4cdd..4f9d9951b90 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -81,6 +81,5 @@ 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 9d9513d8ea6..f811d4385eb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -81,6 +81,5 @@ 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 2eaf084310b..76b4efa6578 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -81,6 +81,5 @@ 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 b3cdfeaa165..11cb9337097 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -81,6 +81,5 @@ 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 103d6c545a2..264986a7b0e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -81,6 +81,5 @@ 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 9c9d55a82aa..267001e33e7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -81,6 +81,5 @@ 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 da38b3d6a48..b235c00230c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -81,6 +81,5 @@ 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 859e13b8859..b8c9743ad00 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -81,6 +81,5 @@ 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 3947196a227..fdb4849afb8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -81,6 +81,5 @@ 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 336d8938c9f..f48d85d9de1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -81,6 +81,5 @@ 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 3574a5b22b2..5d57ea2d008 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -81,6 +81,5 @@ 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 bda94979378..653bf19473c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -81,6 +81,5 @@ 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 bf49773ace7..735b20f1d96 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -81,6 +81,5 @@ 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 5ca83e854b2..3173a517926 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -81,6 +81,5 @@ 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 95350eedcab..cda25f4f34e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -81,6 +81,5 @@ 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 934791ea6be..c79559c5c4f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -81,6 +81,5 @@ 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 bf3ed10a25e..70ee825050a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -81,6 +81,5 @@ 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 16919a84617..e292ca5c97b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -81,6 +81,5 @@ 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 d4c27c5a6e6..f49127f6da5 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -81,6 +81,5 @@ 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 84b0cb849e5..8a6eae31c50 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -81,6 +81,5 @@ 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 059fef89f5f..645596c2b54 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -81,6 +81,5 @@ 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 64f7d66965e..4c4feef4249 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -81,6 +81,5 @@ 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 45dc0512950..e4737c04ed8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -81,6 +81,5 @@ 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 c818b532087..66f008bdc8a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -81,6 +81,5 @@ 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 16a1f9c8a10..ee932bacac7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -81,6 +81,5 @@ 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 412bdfa01da..6d729d3b6fb 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -81,6 +81,5 @@ 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 5a9946d61eb..cfde5ff3d10 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -81,6 +81,5 @@ 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 00cfa171d04..028db1ab496 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -81,6 +81,5 @@ 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 6c486fdf887..bec34e66117 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -81,6 +81,5 @@ 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 62b1665ff68..9a4ed3228f1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -81,6 +81,5 @@ 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 457b6538ce0..35b6be55b64 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -81,6 +81,5 @@ 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 b9254b210b7..3b1b6db3cc2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -81,6 +81,5 @@ 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 ec6a3b30660..a21ed0e393b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -81,6 +81,5 @@ 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 6c8351d2163..727dae00f7f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -81,6 +81,5 @@ 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 7c8beaa9c13..51a7e3fdcd1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -81,6 +81,5 @@ 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 05d3eabb257..7f15e94ddc1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -81,6 +81,5 @@ 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 630af5eed23..8b10e7ef1bf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -81,6 +81,5 @@ 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 17e461246dc..5ec7ebfce9c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -81,6 +81,5 @@ 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 c860b269853..3ec97487398 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -81,6 +81,5 @@ 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 2794f5d5f15..9cb132cd930 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -81,6 +81,5 @@ 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 e8567529143..c2594f568a0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -81,6 +81,5 @@ 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 f7acc60380d..0c360dca76e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -81,6 +81,5 @@ 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 53e04dda6b6..c67d2af4070 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -81,6 +81,5 @@ 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 d72222e1678..98976493b06 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -81,6 +81,5 @@ 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 a873124e280..77b8387de44 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -81,6 +81,5 @@ 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 bbcd86ca869..913605c5448 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -81,6 +81,5 @@ 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 995b39789fa..8247f58caa6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -81,6 +81,5 @@ 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 bc42991f7bf..50e6f96d1cf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -81,6 +81,5 @@ 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 12b0eb3f647..cd93f7163c9 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -81,6 +81,5 @@ 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 d38aec27c02..9a765710aa4 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -81,6 +81,5 @@ 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 3eccafd65a6..4c8e1e4fbdf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -81,6 +81,5 @@ 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 1bc0ca742d0..aae4f626b8f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -81,6 +81,5 @@ 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 020f780e013..f22aa530c2b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -81,6 +81,5 @@ 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 18d8a8447e2..ed848130547 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -81,6 +81,5 @@ 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 13a6f307118..428dc66aef8 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -20,6 +20,7 @@ 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 ce7c2a32f89..de09dd381b2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -87,6 +87,5 @@ 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 9b6c27edd97..6f5750b487b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -87,6 +87,5 @@ 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 5cdb2f973d4..31b54182e7d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -87,6 +87,5 @@ 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 463540e33bd..d11f62fa959 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -87,6 +87,5 @@ 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 fe3c17869ac..c83f5c85da2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -87,6 +87,5 @@ 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 1d558ebbd0a..f34c627ed81 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -87,6 +87,5 @@ 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 51ab8065894..a16dedbda3f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -88,6 +88,5 @@ 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 7eeb99c570f..1d7c9516a83 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -87,6 +87,5 @@ 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 464d2dae58a..4effec14f1b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -87,6 +87,5 @@ 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 d932b04aca5..6fb856337af 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -87,6 +87,5 @@ 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 6b19f214e41..2d5bf676197 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -87,6 +87,5 @@ 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 b866a28851e..5c3a634fe94 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -87,6 +87,5 @@ 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 196b543b06c..ab838d5883c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -87,6 +87,5 @@ 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 6845f71d200..fdba8201d64 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -87,6 +87,5 @@ 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 0359dd57d2c..035a00a4e69 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -87,6 +87,5 @@ 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 d21b1ebdf70..b95bcaa4e11 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -87,6 +87,5 @@ 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 76f9c809ec5..8a6dbef0041 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -87,6 +87,5 @@ 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 99b7578b736..36ad503ab6c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -87,6 +87,5 @@ 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 f25cc10ae5e..79eb27d79d3 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -87,6 +87,5 @@ 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 784ab2d533d..7b5b69cd2c0 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -87,6 +87,5 @@ 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 323b2ac811f..28679a0214a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -87,6 +87,5 @@ 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 520f88c8723..af08860e948 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -87,6 +87,5 @@ 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 efa23864559..72f99b75d15 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
@@ -44,3 +44,4 @@ 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 f8beb8700a9..2e4c96e854e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -88,6 +88,5 @@ 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 b44655b85e9..af6f1a6226a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -88,6 +88,5 @@ 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 0f8cc810a2e..9b4784e8c2a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -88,6 +88,5 @@ 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 e8b3d886ce4..2e3629d940b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -88,6 +88,5 @@ 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 e719254b59c..c0c92a1be9e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -88,6 +88,5 @@ 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 97bd7c3e466..23ac5ceeffe 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -88,6 +88,5 @@ 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 b9ec78f1779..b362080c9c8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -88,6 +88,5 @@ 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 97e3ac1e755..6ee55c9d703 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -88,6 +88,5 @@ 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 8ebec698ffd..e44dfd844ca 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -88,6 +88,5 @@ 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 81a3035a4a8..b7648ebce8c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -88,6 +88,5 @@ 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 4215a95f552..dfa733e329a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -88,6 +88,5 @@ 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 d348a169bae..52fc06cef28 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -88,6 +88,5 @@ 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 c4bcb69b2d5..fdc7266bca0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -88,6 +88,5 @@ 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 3501ab1a31e..61ba2f4b9bb 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -88,6 +88,5 @@ 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 2e7d9bb628c..1fefa7e02c4 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -88,6 +88,5 @@ 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 63adcd821a2..7d0208b6ef3 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -88,6 +88,5 @@ 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 a7073e4364f..dde040fe6a7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -88,6 +88,5 @@ 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 da6a7b6b5da..7ccca0eaccd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -88,6 +88,5 @@ 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 be6f1ce3e18..85a682322a8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -88,6 +88,5 @@ 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 a5186a9c73d..caae84a2557 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -88,6 +88,5 @@ 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 4a0c609aeea..c64654ecbfe 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -88,6 +88,5 @@ 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 2a642b18004..bd2bc694a83 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -88,6 +88,5 @@ 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 66248d728d1..5fec4e12d4d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -88,6 +88,5 @@ 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 bf1437976df..4c7d9054cc6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -88,6 +88,5 @@ 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 28d6eb842a1..f2e55e696bd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -88,6 +88,5 @@ 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 41d355937cb..012849f24ef 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -88,6 +88,5 @@ 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 ed2514e9a0c..a301a016685 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -88,6 +88,5 @@ 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 3384a4ede03..b808fb4ca27 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -88,6 +88,5 @@ 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 2cfdd0d00ac..2240f3cb941 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -88,6 +88,5 @@ 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 8e5433734c9..5586d4adea1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -88,6 +88,5 @@ 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 6d89d30baaf..ce897ba363d 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -88,6 +88,5 @@ 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 bd5d0bb3697..f634c0ecfab 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -88,6 +88,5 @@ 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 dac9444d2a1..8741e1d40ef 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -88,6 +88,5 @@ 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 5fd71aa0fe2..d01ef8fe66f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -88,6 +88,5 @@ 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 bb739664198..105f2512955 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -88,6 +88,5 @@ 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 181eaca073f..e28ee4e95df 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -88,6 +88,5 @@ 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 8e1d2748594..386fa89d3b2 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -88,6 +88,5 @@ 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 5b8734bd3d0..5f1d7850508 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -88,6 +88,5 @@ 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 851c6640630..755603c194e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -88,6 +88,5 @@ 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 0855df5837b..4493902eedd 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -88,6 +88,5 @@ 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 6a0ac13f3cc..3d1ee4d9c3f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -88,6 +88,5 @@ 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 b28d4bf4909..41362ddf0b8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -88,6 +88,5 @@ 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 4fb8518bba6..42c9874f243 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -88,6 +88,5 @@ 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 fa58033e116..e68c73e5395 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -88,6 +88,5 @@ 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 26663729a2b..f377451c939 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -88,6 +88,5 @@ 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 c5e6826a5af..e9d1d662255 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -88,6 +88,5 @@ 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 f0b717d953e..6b588baa7d0 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -88,6 +88,5 @@ 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 fe59f0c2d97..b115d242e06 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -88,6 +88,5 @@ 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 b30c8c73da3..4ff58487249 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -89,34 +89,29 @@ 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 3bbc43b1706..6603b97a136 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -89,34 +89,29 @@ 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 fb1c60fd8f4..8b47d26a442 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -89,34 +89,29 @@ 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 e7a2603ec00..4c88ead90f8 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -89,34 +89,29 @@ 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 9ff1178bcaa..d26b8c520f7 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -89,34 +89,29 @@ 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 01c15545133..a52f15044fc 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -89,34 +89,29 @@ 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 899daae7b85..a7cb03f2f52 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -89,34 +89,29 @@ 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 a5d66c554b9..3666dcb5e46 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -89,34 +89,29 @@ 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 0f7accc9d7b..a6e5a5c24ff 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -20,22 +20,27 @@ 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 a6a0bec0665..21cfa0a93f6 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -92,6 +92,5 @@ 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 438de1931d4..103926cb5e3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -92,6 +92,5 @@ 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 a190fc8aec5..55c2f38bf14 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -92,6 +92,5 @@ 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 e3b41951c1b..b410ebd2c9e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -92,6 +92,5 @@ 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 65da0287124..25660c789b8 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -92,6 +92,5 @@ 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 211f487e139..ebfdcce838a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -92,6 +92,5 @@ 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 c6c008639be..4eb613c1436 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -92,6 +92,5 @@ 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 34849bab1a8..1b372ff3d06 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -92,6 +92,5 @@ 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 b4a1c9483e7..92ed16235b9 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -92,6 +92,5 @@ 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 44d3f3c8434..c60d9b7f605 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -92,6 +92,5 @@ 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 0704bd7a27b..1776dbea16d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -92,6 +92,5 @@ 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 343a639f40a..843e5d8f4e7 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -92,6 +92,5 @@ 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 ea3a320c5b7..691e9511307 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -92,6 +92,5 @@ 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 624f2f6ff8a..c97a975e4c3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -92,6 +92,5 @@ 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 291be8c3c6c..5be24608b62 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -92,6 +92,5 @@ 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 fb8b853ca95..bad199c3ecc 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -92,6 +92,5 @@ 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 44aef8ba103..0bcedb12cc1 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -92,6 +92,5 @@ 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 9f2ea906fa3..e777205df7d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -36,6 +36,7 @@ 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 739ed1a6580..7808c2c2204 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -111,6 +111,5 @@ 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 70dd690c3a8..d9f34b70ec4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -111,6 +111,5 @@ 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 b0a4e7ec61a..4c02998e85a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -111,6 +111,5 @@ 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 b3ff20df82e..6afeb6ea73f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -111,6 +111,5 @@ 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 430fdb4f767..febb0d07917 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -111,6 +111,5 @@ 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 d6fe40d3956..d4b66489445 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -111,6 +111,5 @@ 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 66f010b13b3..95642f5f467 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -111,6 +111,5 @@ 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 01d0fb39cb7..59c6eab43ca 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -111,6 +111,5 @@ 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 00b9438effc..3d03d386fb5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -111,6 +111,5 @@ 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 c6544e0e493..74aa7886c56 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -111,6 +111,5 @@ 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 ba692c769ad..07f5fbb6907 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -111,6 +111,5 @@ 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 e02f6ba0b55..f44bbc6cd4b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -111,6 +111,5 @@ 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 f47ae4be184..e32fcb7dabb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -111,6 +111,5 @@ 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 ccaa53ebdd8..86467af21e8 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -111,6 +111,5 @@ 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 a5184119f8e..734b0693706 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -111,6 +111,5 @@ 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 c740ec90384..6b7ba0c53b7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -111,6 +111,5 @@ 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 4223efb03a5..50c87320482 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -20,6 +20,7 @@ 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 a49f4a36dba..b7a31f8dbe0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -88,41 +88,35 @@ 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 9d033d27e11..f1e6f87557d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -88,41 +88,35 @@ 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 b4cfe55ab53..1a7cf305d81 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -88,41 +88,35 @@ 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 963663f9d1b..4d38be31413 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -88,41 +88,35 @@ 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 2e44173e61c..593ee679f79 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -88,41 +88,35 @@ 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 c8b45f6bb61..97a3af0e0b5 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -88,41 +88,35 @@ 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 e95625ff36f..0ca831bb4ab 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -88,41 +88,35 @@ 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 0583c5b0e00..a25acc4d042 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -88,41 +88,35 @@ 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 9f708ff80a8..b9baa9d21e5 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -88,41 +88,35 @@ 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 b12e8605b12..983cf87e965 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -88,41 +88,35 @@ 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 f8b8053ce3c..25bd756fd81 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -88,41 +88,35 @@ 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 e1da6e7891e..aa6937839e9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -88,41 +88,35 @@ 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 1a632cab5de..0a1783048a8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -88,41 +88,35 @@ 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 423abcac9af..55a3069c723 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -88,41 +88,35 @@ 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 6f40704f152..9fe3908c7b6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -88,41 +88,35 @@ 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 07da302a64d..92663a8ec3e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -88,41 +88,35 @@ 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 9c7d65e9fdb..a998009bb4b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -88,41 +88,35 @@ 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 d0174e2177c..3aed8b69133 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -88,41 +88,35 @@ 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 fb552a0b8df..9f0b5dd6ead 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -88,41 +88,35 @@ 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 995ef641bb9..4b1ffe6c407 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -88,41 +88,35 @@ 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 6c656ad541d..44bb1ca9c56 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -88,41 +88,35 @@ 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 785dea26076..701bc207586 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -88,41 +88,35 @@ 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 2dd99666021..750695ca780 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -88,41 +88,35 @@ 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 6d8c7304747..17bd3daa8eb 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -88,41 +88,35 @@ 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 235bb829b60..b5f5579a281 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -88,41 +88,35 @@ 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 56ed3aa81ef..e5894e70a76 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -88,41 +88,35 @@ 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 76956c848b4..527b33be689 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -88,41 +88,35 @@ 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 0e8941c9005..41bf13646ff 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -88,41 +88,35 @@ 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 c6bd45f0920..ac3702beb70 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -20,20 +20,26 @@ 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 cbb84a029a5..c29e73f13fd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -88,13 +88,11 @@ 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 19e3f8956d9..b80b82f52c6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -88,13 +88,11 @@ 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 8a413b1a560..b6f88a19c27 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -88,13 +88,11 @@ 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 ddce9c73b60..18f18a2789f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -88,13 +88,11 @@ 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 0fc3dc9dd38..e495cee092d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -88,13 +88,11 @@ 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 3032956f85c..3b4bef8af59 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -88,13 +88,11 @@ 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 b0a2d5d7cca..1e89ca8a184 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -88,13 +88,11 @@ 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 51e16217e2e..e4dc60c323a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -88,13 +88,11 @@ 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 1b2dd440a00..37a14f82104 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -88,13 +88,11 @@ 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 92dccd6f7bf..2a4fa7e3d61 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -88,13 +88,11 @@ 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 1c12870e72d..8f534eaaf71 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -88,13 +88,11 @@ 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 1b28c5ced9e..780ff41d493 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -88,13 +88,11 @@ 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 a267ad3a92b..83ae6c059a1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -88,13 +88,11 @@ 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 0d4884979ce..a88f2a1db6c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -88,13 +88,11 @@ 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 52b61ed2cc0..26ac4a0cc63 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -88,13 +88,11 @@ 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 b469271f11e..6c2c15beb65 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -88,13 +88,11 @@ 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 989ea65831e..6b078af3981 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -88,13 +88,11 @@ 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 6f5b677c3a6..32bd215ce02 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -88,13 +88,11 @@ 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 3bc14b87c7d..c1a264954bf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -88,13 +88,11 @@ 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 8b08af66b93..fba94c5ea77 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -88,13 +88,11 @@ 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 280538c5fcf..fc9d3568fd2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -88,13 +88,11 @@ 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 be2750b1294..87140911936 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -88,13 +88,11 @@ 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 e48b2505f65..f935aee1db4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -88,13 +88,11 @@ 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 65da7f70671..765a39dea80 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -88,13 +88,11 @@ 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 82b812288ec..91c469fd6ce 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -88,13 +88,11 @@ 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 14a66a56370..f67b55db40e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -88,13 +88,11 @@ 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 d5a20d393b4..9a556145523 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -88,13 +88,11 @@ 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 a1f2ea80e97..0a752cdada1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -88,13 +88,11 @@ 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 75333c9f8f5..3d66fa8e15a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -88,13 +88,11 @@ 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 62623859c8e..1776bd2d38c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -88,13 +88,11 @@ 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 398082c251e..f825630bdaf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -88,13 +88,11 @@ 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 5d4307ebb69..fe82992dc44 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -88,13 +88,11 @@ 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 c4e312697cf..39f0ebcabae 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -88,13 +88,11 @@ 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 007b1d59bca..bdd3c074ec4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -88,13 +88,11 @@ 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 5d746f8aff3..3f39601f293 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -88,13 +88,11 @@ 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 5e2dadddfa0..b9145082640 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -88,13 +88,11 @@ 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 db2fbb90493..0c0d487fb35 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -88,13 +88,11 @@ 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 4247ad21937..ca17b31b380 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -88,13 +88,11 @@ 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 c93fe598657..e2c10ed3827 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -88,13 +88,11 @@ 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 fa8fdf156d8..ce77c460754 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -88,13 +88,11 @@ 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 f91a6277584..8c0193ce926 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -88,13 +88,11 @@ 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 089921938b0..0d93ab12146 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -88,13 +88,11 @@ 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 15c438e6a08..ac9add65cfc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -88,13 +88,11 @@ 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 1bc75f3e219..b89a461f176 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -88,13 +88,11 @@ 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 bcdb4257d15..7bb75c8594b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -88,13 +88,11 @@ 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 f81697c11fb..6c80adb7d73 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -88,13 +88,11 @@ 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 473b281cd7e..85bdb24880c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -88,13 +88,11 @@ 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 1c56f4482fa..c131bf06fc6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -88,13 +88,11 @@ 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 731c28d3104..5210ed5ab5c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -88,13 +88,11 @@ 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 72fa82beddb..4c92c3f170c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -88,13 +88,11 @@ 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 3d00be9fb65..885756c0851 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -88,13 +88,11 @@ 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 11eb244f339..ba4cd64a173 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -88,13 +88,11 @@ 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 8f945a182e3..ea714a57ff3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -88,13 +88,11 @@ 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 e6831011ca1..6b56107df77 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -88,13 +88,11 @@ 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 a44f73c3b6d..b9f6ec89f34 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -88,13 +88,11 @@ 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 2140eaa8957..ee8d6e5f936 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -88,13 +88,11 @@ 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 87e45d5ffe7..63e039be918 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -88,13 +88,11 @@ 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 7e89a186ad9..458296dca7e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -88,13 +88,11 @@ 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 be8df96629e..dcd0b650bce 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -88,13 +88,11 @@ 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 e292576d561..bf84b188da6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -88,13 +88,11 @@ 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 e00c0ef9c73..7d14fb092dc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -88,13 +88,11 @@ 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 0545eaca4c1..d7713d74959 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -88,13 +88,11 @@ 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 95be39fecfe..383ac6edf9b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -88,13 +88,11 @@ 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 4701a44725d..69bc56752c3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -88,13 +88,11 @@ 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 bd803ad1cb7..b6dcb84717c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -88,13 +88,11 @@ 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 28bb72c357a..eba889e4b1b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -88,13 +88,11 @@ 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 8b965c2b4f8..359bb80d567 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -88,13 +88,11 @@ 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 116f1155e1a..c40bf5daea8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -88,13 +88,11 @@ 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 bc646dba5ac..2c8e8aae72b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -88,13 +88,11 @@ 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 237ca5172ae..d11f06190c1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -88,13 +88,11 @@ 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 fe25470df7b..07e348aec7e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -88,13 +88,11 @@ 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 6e297a72e8d..0bb5a91aaf7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -88,13 +88,11 @@ 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 359ece83bf2..9a491b03311 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -20,8 +20,10 @@ 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 f1b94bedf5f..6c8bec2c00a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -92,6 +92,5 @@ 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 43f29dae31e..8f46e00adc6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -92,6 +92,5 @@ 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 cb2de1e5713..e2174872011 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -92,6 +92,5 @@ 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 c151ec6b286..1831d92c365 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -92,6 +92,5 @@ 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 7159d2d9819..8b3810f2494 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -92,6 +92,5 @@ 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 79980061dbb..c18f524ca13 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-15.yaml
@@ -92,6 +92,5 @@ 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 9baeb6511f8..cf6ee43ee42 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -92,6 +92,5 @@ 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 ab5f56b8e2e..31f5a43fcba 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -92,6 +92,5 @@ 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 30f1047a981..1726b62e774 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -92,6 +92,5 @@ 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 375747fba17..fc1a13cbeda 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-19.yaml
@@ -92,6 +92,5 @@ 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 a83b6797862..4cf9dc1e5d0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -92,6 +92,5 @@ 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 6e4aa1eb3de..3df8296ecd5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-20.yaml
@@ -92,6 +92,5 @@ 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 43a3ce9c6ed..9e3f959fcc5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-21.yaml
@@ -92,6 +92,5 @@ 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 6f9f80550bc..89ef4247173 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-22.yaml
@@ -92,6 +92,5 @@ 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 3fcbaaffba5..60492b0eccb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-23.yaml
@@ -92,6 +92,5 @@ 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 eb5bf2a3fa2..5d6994e9353 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-24.yaml
@@ -92,6 +92,5 @@ 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 9b233f29604..7e06f8f18d6 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -92,6 +92,5 @@ 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 93cd3283af8..87f069cdb5d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -92,6 +92,5 @@ 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 5eb52dd5c92..edcba37672a 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -92,6 +92,5 @@ 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 dd8fc47b859..9b37ecae53d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -92,6 +92,5 @@ 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 15921ec55ef..74938f2dcc0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -92,6 +92,5 @@ 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 aef49cdc50d..a32632e3d48 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-3.yaml
@@ -89,6 +89,5 @@ 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 b26c0022f89..6b9a3ee75ef 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-30.yaml
@@ -92,6 +92,5 @@ 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 22cd2a480e3..a52159d29f5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -92,6 +92,5 @@ 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 53a9703a78e..915b1ab39bb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-32.yaml
@@ -90,6 +90,5 @@ 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 3bf8da6d8f2..e791b0ac47e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -92,6 +92,5 @@ 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 858a9e7d87b..7b17235a30d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -92,6 +92,5 @@ 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 8120ceae414..b1ab5e640db 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -92,6 +92,5 @@ 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 70ecd90e25a..54b80a08b5d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -92,6 +92,5 @@ 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 1fc068ff802..807edf40ffd 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -92,6 +92,5 @@ 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 5ed4da2382f..5c40c550e99 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -92,6 +92,5 @@ 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 0517d4adbd4..920b26eb4be 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-39.yaml
@@ -92,6 +92,5 @@ 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 acb2386174d..66dec761924 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -92,6 +92,5 @@ 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 72cb9a7ae32..71c2d57cf5d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-40.yaml
@@ -92,6 +92,5 @@ 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 c9d821b127c..787d6524dbe 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -92,6 +92,5 @@ 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 3f3d6b4974f..bb9f1b8b417 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -92,6 +92,5 @@ 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 f9a717aaba1..08af4d4f1f2 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -92,6 +92,5 @@ 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 728fa829344..371e5074f23 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -92,6 +92,5 @@ 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 e1189b2faf4..0f5808e74e3 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -92,6 +92,5 @@ 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 ffa2b37283c..06f5a5df7ee 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -92,6 +92,5 @@ 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 7c0b1e9cbb4..aee9a80a903 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -92,6 +92,5 @@ 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 1de09a60859..65d1f178556 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -92,6 +92,5 @@ 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 aedc6f68a3a..65a504d03cb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -92,6 +92,5 @@ 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 4d8c1495e11..a9bdf09db80 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
@@ -46,3 +46,4 @@ nodes:
     storage_devices:
       sda:
         interface: SATA
+        storage: HDD
diff --git a/scripts/edit-input-storage.rb b/scripts/edit-input-storage.rb
deleted file mode 100755
index 5b9ec03c1b2..00000000000
--- a/scripts/edit-input-storage.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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